From patchwork Mon Oct 16 16:49:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 153696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3611604vqb; Mon, 16 Oct 2023 10:21:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNY9qox62rlK3DQiIIhtbHSkKIzOzY5/QIBuUh/z5iAYXDBPwgUl+t9NC8ZHAEuBv/5423 X-Received: by 2002:a05:6a00:1622:b0:6bc:ff89:a2fc with SMTP id e2-20020a056a00162200b006bcff89a2fcmr5799580pfc.2.1697476876933; Mon, 16 Oct 2023 10:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697476876; cv=none; d=google.com; s=arc-20160816; b=oJPKme+CxeNSuyAECmO9k/pRZA+5uACca+zsOLnoH6j+iKuiu17pvglaaS+2ZlTV7y x96lmPX40ST4e4/+aD7XKPoQLygH3VHJLHjX784/0cO020HWn7s2uGEpiykLcBffl11z 6PZjuI8dVTWFRHjHKzj8PBSbzYeVlagd7BAiuSKUcV8wA+CZApCrL/8oNhBu3RdheuzD NDMsaZQc/wvf7evzROshQLbUZKHOKZzS+g9PlJlIvdmESHz2OifJ6TPv8ebAdiB/N9pB EPikY4y6q4nXQh+cPtPIzm1he8fHZIX+Kh3/utgRfx5ecLQoAsSsSvAReHUqYDVp7ijB cD0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; fh=Y0m7JLoklKZIK9tSUocT22YAao4oPAslcLlpsoUI+eM=; b=Fj7iGiHhg/OvhirOCbgnOt8a0e7C7RZdMiFegSObNNgewKogpNLNyp7FmJ/ZcjjZ0q XeLtXaeQJady1OM/D+qvaeFHTxvr6o8HvGv+uaKA+lFZRct/Gjmrgk9ilZ4Yj6mcOr8S JRHcK3lC1YFvDDtanVgKRWJeghIUoJcf0sxsZF21cj7vgxyj+iFrx3UEXwe924T+1CZw r9e0lsLe1oOUqd9G5RJmCpD/stNeS6EognGJSJ5h8Q5i7dDwu+G0WDRUSEUBHU+FPJLl ArpxUTSqMX2Prc6Iv6zuFdrXwzA3fyc1lnsRORU+fgr6lNMnKY9GfeIDHaidrtX7opnR TJ7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=TQEbZR5I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id r80-20020a632b53000000b00578ac88e239si11236780pgr.595.2023.10.16.10.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 10:21:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=TQEbZR5I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 917678021235; Mon, 16 Oct 2023 10:21:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233725AbjJPRVB (ORCPT + 18 others); Mon, 16 Oct 2023 13:21:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233945AbjJPRU4 (ORCPT ); Mon, 16 Oct 2023 13:20:56 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A20330DE for ; Mon, 16 Oct 2023 09:50:11 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6b3c2607d9bso2337533b3a.1 for ; Mon, 16 Oct 2023 09:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1697475011; x=1698079811; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; b=TQEbZR5I3mwF8aFca89GAt1KoFSJF53udj3ReynViMjvp2q8ufWOGy0GN7Cic0tmkN FkqN1ONwbQuJLdOG0eTtttNh7I1WCiLRDHqUm31nqK12LOxH0mMwkOJIJUJulouAmgRE 9xDhUu0y5t5fkL9Ig6wqMVRktaPZUgu0F30UFAbgEHCRByEg/1Oc0oro+Vc7h5RkEuqi UD44Hp4YOyYgjbnHxB3CcH2ZkgiI2PzcGXitKOhBhfpuefPB2Rd/TakKdbXl9YV/qw41 Du5xujCVEwQROZfyOy0x5UOo0uY8JuUAbwonigxsONkPeBWiCbpEHseJcP4qUpFyvU4J TRcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697475011; x=1698079811; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fGpfWXp12h96iIrhrZ9w/4qboCYb79h5kFDLjoFea9A=; b=Y1mDqkfxIf+q+Ay5fKlqcAuEB4897JEr5uyk0Bwi/i2FSeJeJvHqr+eE1JajMdPwRr wvW+VV3Sr1nlvLLG0hC4LTX4xLXMWEZMxTsqUw6D9vasXyoPn/V5/LfH1XR5uyMAHanb 8jczifmxIEaR6U3Di9sAWgL7kQeSrbiOd/c6woiA7c4zIiTP0pGs3cF/FRtDQDQBNVeB BWb+ffhVJnHRiAbAWujuMn3vxp+Xp2uUR32dTX0hyhRKNSIp115nBzp8eGDPwz15XLzw iMyLrDUMW/grp5Wg+ekr705EetAyhtm+MXLSxSBfqrReACnKY1dEAwYRxexXE7cLd6ue dL5g== X-Gm-Message-State: AOJu0Yxi2mnrXhg3gfr8hCJkkDZxF7qAW5AFavbu62w930HiMeRthT9m 17qF4DUH+PJWflDVcf0U6IJkog== X-Received: by 2002:a05:6a00:1389:b0:6b2:6835:2a82 with SMTP id t9-20020a056a00138900b006b268352a82mr9317417pfg.13.1697475010850; Mon, 16 Oct 2023 09:50:10 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id t21-20020a056a0021d500b006b1e8f17b85sm111252pfj.201.2023.10.16.09.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:50:10 -0700 (PDT) From: Sunil V L To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Atish Kumar Patra , Sunil V L , Alexandre Ghiti Subject: [PATCH v3 -next 1/3] RISC-V: ACPI: Enhance acpi_os_ioremap with MMIO remapping Date: Mon, 16 Oct 2023 22:19:56 +0530 Message-Id: <20231016164958.1191529-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016164958.1191529-1-sunilvl@ventanamicro.com> References: <20231016164958.1191529-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 16 Oct 2023 10:21:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779933513877172985 X-GMAIL-MSGID: 1779933513877172985 Enhance the acpi_os_ioremap() to support opregions in MMIO space. Also, have strict checks using EFI memory map to allow remapping the RAM similar to arm64. Signed-off-by: Sunil V L Reviewed-by: Andrew Jones Reviewed-by: Alexandre Ghiti Acked-by: Conor Dooley --- arch/riscv/Kconfig | 1 + arch/riscv/kernel/acpi.c | 87 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index d607ab0f7c6d..805c8ab7f23b 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -39,6 +39,7 @@ config RISCV select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_HAS_VDSO_DATA + select ARCH_KEEP_MEMBLOCK if ACPI select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT select ARCH_STACKWALK diff --git a/arch/riscv/kernel/acpi.c b/arch/riscv/kernel/acpi.c index 56cb2c986c48..e619edc8b0cc 100644 --- a/arch/riscv/kernel/acpi.c +++ b/arch/riscv/kernel/acpi.c @@ -14,9 +14,10 @@ */ #include +#include #include +#include #include -#include int acpi_noirq = 1; /* skip ACPI IRQ initialization */ int acpi_disabled = 1; @@ -217,7 +218,89 @@ void __init __acpi_unmap_table(void __iomem *map, unsigned long size) void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) { - return (void __iomem *)memremap(phys, size, MEMREMAP_WB); + efi_memory_desc_t *md, *region = NULL; + pgprot_t prot; + + if (WARN_ON_ONCE(!efi_enabled(EFI_MEMMAP))) + return NULL; + + for_each_efi_memory_desc(md) { + u64 end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT); + + if (phys < md->phys_addr || phys >= end) + continue; + + if (phys + size > end) { + pr_warn(FW_BUG "requested region covers multiple EFI memory regions\n"); + return NULL; + } + region = md; + break; + } + + /* + * It is fine for AML to remap regions that are not represented in the + * EFI memory map at all, as it only describes normal memory, and MMIO + * regions that require a virtual mapping to make them accessible to + * the EFI runtime services. + */ + prot = PAGE_KERNEL_IO; + if (region) { + switch (region->type) { + case EFI_LOADER_CODE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: + case EFI_CONVENTIONAL_MEMORY: + case EFI_PERSISTENT_MEMORY: + if (memblock_is_map_memory(phys) || + !memblock_is_region_memory(phys, size)) { + pr_warn(FW_BUG "requested region covers kernel memory\n"); + return NULL; + } + + /* + * Mapping kernel memory is permitted if the region in + * question is covered by a single memblock with the + * NOMAP attribute set: this enables the use of ACPI + * table overrides passed via initramfs. + * This particular use case only requires read access. + */ + fallthrough; + + case EFI_RUNTIME_SERVICES_CODE: + /* + * This would be unusual, but not problematic per se, + * as long as we take care not to create a writable + * mapping for executable code. + */ + prot = PAGE_KERNEL_RO; + break; + + case EFI_ACPI_RECLAIM_MEMORY: + /* + * ACPI reclaim memory is used to pass firmware tables + * and other data that is intended for consumption by + * the OS only, which may decide it wants to reclaim + * that memory and use it for something else. We never + * do that, but we usually add it to the linear map + * anyway, in which case we should use the existing + * mapping. + */ + if (memblock_is_map_memory(phys)) + return (void __iomem *)__va(phys); + fallthrough; + + default: + if (region->attribute & EFI_MEMORY_WB) + prot = PAGE_KERNEL; + else if ((region->attribute & EFI_MEMORY_WC) || + (region->attribute & EFI_MEMORY_WT)) + prot = pgprot_writecombine(PAGE_KERNEL); + } + } + + return ioremap_prot(phys, size, pgprot_val(prot)); } #ifdef CONFIG_PCI From patchwork Mon Oct 16 16:49:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 153661 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3595144vqb; Mon, 16 Oct 2023 09:55:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEVF7aNGaz2tuq/UrRHo1Xjbt5IWS5aDvYi+m94OXSKg16uog4BIwZDeJHtiFXxhs8jn7sn X-Received: by 2002:a17:903:181:b0:1ca:28f3:569a with SMTP id z1-20020a170903018100b001ca28f3569amr7110696plg.5.1697475349361; Mon, 16 Oct 2023 09:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697475349; cv=none; d=google.com; s=arc-20160816; b=ZPlRfXSSSQwP4XC1si14SWC4knHmB1EFFEFAiEAZnlW4gluEXKJSUxvix78P/s19nI /hN+stwa6tg4uI7/dLhqWz9CK//mu9XeDnLs+tTaoiuaF1I28sygpzaaPFBxamPUOFmj qH1RlXLcAQXhJBAD7V+j3Ma9cM1OmX11GRJ4JeUR4QtKFIBRuqMXUVq+wpZYB1b9S7rp udnZWpbOXHsQKz3tio4oBdihIcZx/0FT6x8acHLBJBlx0PbYow2tfOChshAygE/oaFdB l6wio8Ngsj/1q2+RR7Vz4MKlZWNxRSBFjUJ6us10T2SQzdEkQjVPUE93GL0iGctJnXtF mjhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; fh=GSUzFmVoxnIYRJr2qxP5oVP2HvI7gxdu+Sv/xWUv4xo=; b=ylFd/L20Kq93vU8OD08ImROtnT4j2Mma7GWJWdsfM9oLUSJy9mknSr82cVk/7bEKPl JZBV94bblNG6oqybtBcW+PfW3xCqxlsVkAqpoILI+68XZBpVle6cHagbDhtT2zAe7oph z1xdYG3ym5qu2wNB5UE3TSzKbY1GxkQCB37QhnCq/hRWMzzn/TPmKHNCJ+RtP+4wb7ps F4sjMn6Jwas4hjDxmGCHDqgM+V1HVW9ZUvD92JsyyPcFw1YKIfIuWNUDJXTwH2v4bBUX oSlDaSii2UCNwmifm2UcB+LUFwt9xclZHiQ49kEaz2P2JQOMhQ/J9Fx3Q3gIFKHYLMTB KqPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ejddTP9L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id a6-20020a170902ee8600b001c60783985esi10695680pld.93.2023.10.16.09.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=ejddTP9L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 53A16809F381; Mon, 16 Oct 2023 09:55:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234281AbjJPQzV (ORCPT + 18 others); Mon, 16 Oct 2023 12:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233931AbjJPQzG (ORCPT ); Mon, 16 Oct 2023 12:55:06 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05170E1CF for ; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-57bca5b9b0aso2503025eaf.3 for ; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1697475015; x=1698079815; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; b=ejddTP9LVNNwFngQrJ2MDm+S6rqEhAZBTy5rwQ2m0W9rGjH2ZCCFikWZ5j57O7cvkQ C6HibdcLOD2rMH6vyIEWjT6kEfexxPxBwFhVFTqt8QRmJK5N+d2XBgI4QDeCc+W2D179 HPuPXbg6rspGID9EXgbjFYuWH1C/mlCHMbGGTEW/n7sej0YASa91E7TjkbFQEKFhJzVb 6OH9GnHg/zmNLWglO/0HheXV+lmWfVmOsYfFjQZAvZkJK9p5WariVEYDQXAIuakIuGdl 1/pYUrfMH531wx85NJEq+sARZpNhMaBa3uUpq7qY4pq5TIXnIdXnRxHE5iizYQgy02H7 Sy6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697475015; x=1698079815; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=771urCD3ivMrGFxRwO6FF0bHhNMWlumN7WHUnj5mC2E=; b=EV0vmaPMKIHPY4xWvKqf7HSqERFuBUWjC1LqJp/nwxN60dc6eHtv80itdX8Sv/7KSy T4dL9hBPKIo6G6J1xzwT+DuAbouw9JpRc+MB04RGYicmb+km+ngHnHzhAO4gNwvxPE4r vQ99usVOt7uOezZu99tL8MuxCQIx5BVsrbpgOz0XZMn82bHNAyEfppBLfYhOBQ0CgntM 2tOsFwrDwrcKZB7RMwcr8emYDir2jRs/DhVIQbB6h8wdibbAiadmiEWw0Ffw17ibjfoN o/G7FOF6gtpw0uQEbMqmPdIDgTQMmOdzSv9vdxz2SVKM92Yy9NdLoj9stqnIRQXVVd3p 1IPw== X-Gm-Message-State: AOJu0YzbeaFR1dp1/P7WLeI2n5M1sOK1u9LqRuSOnFwNXG0lV6GihD5P F4Yw4dYgnlC+ehkZmatE5mH/lA== X-Received: by 2002:a05:6358:18:b0:164:a5c0:46ac with SMTP id 24-20020a056358001800b00164a5c046acmr18820773rww.21.1697475015175; Mon, 16 Oct 2023 09:50:15 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id t21-20020a056a0021d500b006b1e8f17b85sm111252pfj.201.2023.10.16.09.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:50:14 -0700 (PDT) From: Sunil V L To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Atish Kumar Patra , Sunil V L Subject: [PATCH v3 -next 2/3] RISC-V: ACPI: RHCT: Add function to get CBO block sizes Date: Mon, 16 Oct 2023 22:19:57 +0530 Message-Id: <20231016164958.1191529-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016164958.1191529-1-sunilvl@ventanamicro.com> References: <20231016164958.1191529-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 16 Oct 2023 09:55:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779931911598103371 X-GMAIL-MSGID: 1779931911598103371 Cache Block Operation (CBO) related block size in ACPI is provided by RHCT. Add support to read the CMO node in RHCT to get this information. Signed-off-by: Sunil V L Reviewed-by: Andrew Jones --- arch/riscv/include/asm/acpi.h | 6 +++ drivers/acpi/riscv/rhct.c | 93 +++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index d5604d2073bc..7dad0cf9d701 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -66,6 +66,8 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa); static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } +void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size); #else static inline void acpi_init_rintc_map(void) { } static inline struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu) @@ -79,6 +81,10 @@ static inline int acpi_get_riscv_isa(struct acpi_table_header *table, return -EINVAL; } +static inline void acpi_get_cbo_block_size(struct acpi_table_header *table, + u32 *cbom_size, u32 *cboz_size, + u32 *cbop_size) { } + #endif /* CONFIG_ACPI */ #endif /*_ASM_ACPI_H*/ diff --git a/drivers/acpi/riscv/rhct.c b/drivers/acpi/riscv/rhct.c index b280b3e9c7d9..105f1aaa3fac 100644 --- a/drivers/acpi/riscv/rhct.c +++ b/drivers/acpi/riscv/rhct.c @@ -8,6 +8,7 @@ #define pr_fmt(fmt) "ACPI: RHCT: " fmt #include +#include static struct acpi_table_header *acpi_get_rhct(void) { @@ -81,3 +82,95 @@ int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const return -1; } + +static void acpi_parse_hart_info_cmo_node(struct acpi_table_rhct *rhct, + struct acpi_rhct_hart_info *hart_info, + u32 *cbom_size, u32 *cboz_size, u32 *cbop_size) +{ + u32 size_hartinfo = sizeof(struct acpi_rhct_hart_info); + u32 size_hdr = sizeof(struct acpi_rhct_node_header); + struct acpi_rhct_node_header *ref_node; + struct acpi_rhct_cmo_node *cmo_node; + u32 *hart_info_node_offset; + + hart_info_node_offset = ACPI_ADD_PTR(u32, hart_info, size_hartinfo); + for (int i = 0; i < hart_info->num_offsets; i++) { + ref_node = ACPI_ADD_PTR(struct acpi_rhct_node_header, + rhct, hart_info_node_offset[i]); + if (ref_node->type == ACPI_RHCT_NODE_TYPE_CMO) { + cmo_node = ACPI_ADD_PTR(struct acpi_rhct_cmo_node, + ref_node, size_hdr); + if (cbom_size && cmo_node->cbom_size <= 30) { + if (!*cbom_size) { + *cbom_size = BIT(cmo_node->cbom_size); + } else if (*cbom_size != + BIT(cmo_node->cbom_size)) { + pr_warn("CBOM size is not the same across harts\n"); + } + } + + if (cboz_size && cmo_node->cboz_size <= 30) { + if (!*cboz_size) { + *cboz_size = BIT(cmo_node->cboz_size); + } else if (*cboz_size != + BIT(cmo_node->cboz_size)) { + pr_warn("CBOZ size is not the same across harts\n"); + } + } + + if (cbop_size && cmo_node->cbop_size <= 30) { + if (!*cbop_size) { + *cbop_size = BIT(cmo_node->cbop_size); + } else if (*cbop_size != + BIT(cmo_node->cbop_size)) { + pr_warn("CBOP size is not the same across harts\n"); + } + } + } + } +} + +/* + * During early boot, the caller should call acpi_get_table() and pass its pointer to + * these functions(and free up later). At run time, since this table can be used + * multiple times, pass NULL so that the table remains in memory + */ +void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size, + u32 *cboz_size, u32 *cbop_size) +{ + u32 size_hdr = sizeof(struct acpi_rhct_node_header); + struct acpi_rhct_node_header *node, *end; + struct acpi_rhct_hart_info *hart_info; + struct acpi_table_rhct *rhct; + + if (acpi_disabled) + return; + + if (table) { + rhct = (struct acpi_table_rhct *)table; + } else { + rhct = (struct acpi_table_rhct *)acpi_get_rhct(); + if (!rhct) + return; + } + + if (cbom_size) + *cbom_size = 0; + + if (cboz_size) + *cboz_size = 0; + + if (cbop_size) + *cbop_size = 0; + + end = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->header.length); + for (node = ACPI_ADD_PTR(struct acpi_rhct_node_header, rhct, rhct->node_offset); + node < end; + node = ACPI_ADD_PTR(struct acpi_rhct_node_header, node, node->length)) { + if (node->type == ACPI_RHCT_NODE_TYPE_HART_INFO) { + hart_info = ACPI_ADD_PTR(struct acpi_rhct_hart_info, node, size_hdr); + acpi_parse_hart_info_cmo_node(rhct, hart_info, cbom_size, + cboz_size, cbop_size); + } + } +} From patchwork Mon Oct 16 16:49:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 153662 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp3595149vqb; Mon, 16 Oct 2023 09:55:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEq4hEcKPbSsh/0vzGwFABDU08u5nsv2QmhGSxKI8TtAYdLQhzmiCY7o1G0YPhHGpbqkMZa X-Received: by 2002:a05:6870:ab13:b0:1e9:9f9b:eb7a with SMTP id gu19-20020a056870ab1300b001e99f9beb7amr15266875oab.4.1697475349899; Mon, 16 Oct 2023 09:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697475349; cv=none; d=google.com; s=arc-20160816; b=w3/tZ4nnPF2CeJzeXsskTYFRaNpJzFScFaKPQBFdXWsxvEl4VNK6J7pz1TTZpqGjOr Dr+OhlFAd7JoGf1eSo6qJN/udDuvrLLLHs+/Py5SGnAuNSeRDn6Ql9LlkHBurdVH29Ys e+AbqO728XXAjewncJkQ11xQySAuzwAyDX+No9GbnYhEr1UKJxBRRy1y8ALmcP9pQG67 QCXuVxgIFJkQ2l/1QtihWBom/v9KcP6T4UZVZTI+fEBNHJ58dFN0QFUth4DljmTEh0lA Zie2/JhiaEBDS4DZSrtpi1jJ9JkHDBrqaWOwXKyjWvcze/HZdmTKuqBJUOOHLL4x/9yG 2DPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZZ0vGD2+BKy40gDZpkmDGFYSfDE+/JpanTOV3I4/UO0=; fh=GSUzFmVoxnIYRJr2qxP5oVP2HvI7gxdu+Sv/xWUv4xo=; b=NxR1KTki5DZW3mYLGwPTGjP+2+P5K/boKtDsjeHZNnfliI6sJcrhtCWO274wvZu7lM Uii4U6uW7h9XQPshedkAs5k0TWeVYs1BwompnOD91YyZx51I/35tPFu7VwWijIxA3+qQ EG/UWOkJp+5ZyTqE77LMBU6+onK3pM8MSl7wnAikMzy1XMYHdtHcwOEk45FlHLzGBn1y Qqsx/JqJmsDBxITbaOc/Ha4PJMKrXZ6J+GPsNChpO/3jqfWvq4Lr2Zqncg2gWsuOd39J Rd5EcXfuA/Td4Lre+8LlxBoJVB2u5OPSV+PUz5JMJ6MJrEb1ctWA9ikgOBtobTpfCNWr Wx4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=gQArJ88m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id t189-20020a6381c6000000b005ac13270364si7638021pgd.732.2023.10.16.09.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=gQArJ88m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 604FB80A4ADF; Mon, 16 Oct 2023 09:55:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234470AbjJPQzY (ORCPT + 18 others); Mon, 16 Oct 2023 12:55:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234328AbjJPQzJ (ORCPT ); Mon, 16 Oct 2023 12:55:09 -0400 Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79CC0385E for ; Mon, 16 Oct 2023 09:50:20 -0700 (PDT) Received: by mail-ot1-x32e.google.com with SMTP id 46e09a7af769-6c4b9e09528so3241746a34.3 for ; Mon, 16 Oct 2023 09:50:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1697475019; x=1698079819; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZZ0vGD2+BKy40gDZpkmDGFYSfDE+/JpanTOV3I4/UO0=; b=gQArJ88mZHl4FZCcgOndCz7jWFnjzhzDkmv73hirutORkdAvF/uryfkl4E7orGhVAq vFZVFGowdwMfpS4bbJu+2TDe/YtN+1O31HgopAffcByIEX1EKA0gJQlPQVTquhalTXJh 8Q0cPjouu+tU6EhjLWB+9F5VzXNW9DgPqN3o6LOV+L0qj+lcoF3M7X79KHEruRIDTtTr qGYMPbJgcRn7/B7roaTjuThQEz0590Cx82ZgRcivNXKc9ftOMF/PU2mEdLBEfQvq+Ocw Y8Dt+8f8yURcAuTAPPH8DdLCVlTPOYkA5Le5TTibEcTP9p6OJVt99sgSgu4cLBdJe4pv iuxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697475019; x=1698079819; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZZ0vGD2+BKy40gDZpkmDGFYSfDE+/JpanTOV3I4/UO0=; b=GtwRwQU83wJdS3ovf40CDTQq3PCLIHGi+inkHeP70eNHDGQCb94HswZuUu3wj05fsg LwwpTPMLy/Owe5erYPwoUDlMSUsF2vpqc9jaahLAU+Bf/SwJrLhrboF6VfU96qaK8hLZ i+cAtg2PQq8OufZnAxdziZOj/TpC2yrJG/ySZrdo/Juz+AGvTGB4WR3WumsJTVbf2pFw edCOXbarOi1RqtF1V9jLrbEsU2toE3RwpJOidFXMP1qA8oHIlPK3PYk2Ah7xIXJVwUB0 OXVHu1SkvpEKJ/wDeFIjZC4K/jFD5HOsyZPKeb3cn/N2cNhc17XAoxSZTbWIkPcH1CBw u94g== X-Gm-Message-State: AOJu0YzNeuxQQ+3bI9m1OOb93mXB175isstIpRVvqjiklOf34dVu9UeJ T//A+g1MXbur5HtRhtyhe1X8pw== X-Received: by 2002:a05:6830:4ae:b0:6c4:9ca1:f13a with SMTP id l14-20020a05683004ae00b006c49ca1f13amr35003337otd.35.1697475019591; Mon, 16 Oct 2023 09:50:19 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.188.78]) by smtp.gmail.com with ESMTPSA id t21-20020a056a0021d500b006b1e8f17b85sm111252pfj.201.2023.10.16.09.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:50:18 -0700 (PDT) From: Sunil V L To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J . Wysocki" , Len Brown , Andrew Jones , Conor Dooley , Anup Patel , Ard Biesheuvel , Atish Kumar Patra , Sunil V L Subject: [PATCH v3 -next 3/3] RISC-V: cacheflush: Initialize CBO variables on ACPI systems Date: Mon, 16 Oct 2023 22:19:58 +0530 Message-Id: <20231016164958.1191529-4-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016164958.1191529-1-sunilvl@ventanamicro.com> References: <20231016164958.1191529-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: ** X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 16 Oct 2023 09:55:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779931912426823062 X-GMAIL-MSGID: 1779931912426823062 Initialize the CBO variables on ACPI based systems using information in RHCT. Signed-off-by: Sunil V L Reviewed-by: Andrew Jones Reviewed-by: Samuel Holland --- arch/riscv/mm/cacheflush.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index f1387272a551..55a34f2020a8 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c @@ -3,7 +3,9 @@ * Copyright (C) 2017 SiFive */ +#include #include +#include #include #ifdef CONFIG_SMP @@ -124,13 +126,24 @@ void __init riscv_init_cbo_blocksizes(void) unsigned long cbom_hartid, cboz_hartid; u32 cbom_block_size = 0, cboz_block_size = 0; struct device_node *node; + struct acpi_table_header *rhct; + acpi_status status; + + if (acpi_disabled) { + for_each_of_cpu_node(node) { + /* set block-size for cbom and/or cboz extension if available */ + cbo_get_block_size(node, "riscv,cbom-block-size", + &cbom_block_size, &cbom_hartid); + cbo_get_block_size(node, "riscv,cboz-block-size", + &cboz_block_size, &cboz_hartid); + } + } else { + status = acpi_get_table(ACPI_SIG_RHCT, 0, &rhct); + if (ACPI_FAILURE(status)) + return; - for_each_of_cpu_node(node) { - /* set block-size for cbom and/or cboz extension if available */ - cbo_get_block_size(node, "riscv,cbom-block-size", - &cbom_block_size, &cbom_hartid); - cbo_get_block_size(node, "riscv,cboz-block-size", - &cboz_block_size, &cboz_hartid); + acpi_get_cbo_block_size(rhct, &cbom_block_size, &cboz_block_size, NULL); + acpi_put_table((struct acpi_table_header *)rhct); } if (cbom_block_size)