From patchwork Mon Jul 26 10:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 485817 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp3647670jao; Mon, 26 Jul 2021 03:00:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyktOZ4PrO90VmCn9rsvOifZKu0GNdoYxLhS0wyBvl1+9ezW3H8y32K5eheqU7HfJLg4yEX X-Received: by 2002:a02:380b:: with SMTP id b11mr15690035jaa.83.1627293642412; Mon, 26 Jul 2021 03:00:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627293642; cv=none; d=google.com; s=arc-20160816; b=QRq80mpXlWd1ObDwO2IVHahmZKdJ1RR45D+V7gaQX6x0+Qp94VxmP28NrTGleLIwAC Zc01/j713ZTGpII6EAXiRsDu1xhgmszS1EbmuXqaSXDRAqd7RyBFch64aIYP1lwQg/0h WCTSH4/JJSYhz//p0RtH5PL2rRA9Y7IEZ/YahyTvK49YNCBy3PQo0XvHtG/pQAEkP8Hp pZfJPcIxzfjmyzZcqD7BMj7LNAdtQcYkAFGgbRRQdDJ6hqEGhuIoCCxpYiYdth3XqC2z 0cOxgg0Qbet+I/PWh28VCMcNKoZ7gzd3Szh6MdyjB3X/tP5DbWiS/7x2o60DFSF8SGAq Vq5A== 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 :message-id:date:subject:cc:to:from; bh=M9TF7cgptQk5Gh2VG5Ybee7AsfWGDCOGX6dXDZagSN4=; b=bGzlw2tThDWvQPtpSWhCgxi+6ooWtmHEt21Fs9mTZHpILjb06mNFHsqqvmn/fA98I4 4GNNdbtvOeglK9AyTScXnhOh9ELSClCGZhk+jPkwb6fIsmQD0bWJKVbiQk9c0j4UVIWn yZv9tpCnF39cOOcbJSv14ppRZVEJ8i6H6CDLpA3Ng17L0RrbtrwW5xEBhb4X6s4rpcUX Ii2fAmIZxSUZsGE4gXVj4TwR083QyKVJ961ehktIjPCTjKdFH1E6Z6x1WhgDrWu8FjTi 50gTKX6Wa/wtY7Tj4YnISJVMJMEjyBt2Sr5FnOlqbSjMgpC+/f0W1fveOFQzK3f5lPA2 TJWA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u5si49509412jad.124.2021.07.26.03.00.41; Mon, 26 Jul 2021 03:00:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232776AbhGZJUL (ORCPT + 4 others); Mon, 26 Jul 2021 05:20:11 -0400 Received: from foss.arm.com ([217.140.110.172]:49144 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232617AbhGZJUK (ORCPT ); Mon, 26 Jul 2021 05:20:10 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 612FC106F; Mon, 26 Jul 2021 03:00:39 -0700 (PDT) Received: from e123427-lin.arm.com (unknown [10.57.38.64]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 95AAA3F70D; Mon, 26 Jul 2021 03:00:36 -0700 (PDT) From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi , Ard Biesheuvel , Will Deacon , Hanjun Guo , Sudeep Holla , Catalin Marinas , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Veronika kabatova , Robin Murphy Subject: [PATCH] ACPI: Add memory semantics to acpi_os_map_memory() Date: Mon, 26 Jul 2021 11:00:26 +0100 Message-Id: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The memory attributes attached to memory regions depend on architecture specific mappings. For some memory regions, the attributes specified by firmware (eg uncached) are not sufficient to determine how a memory region should be mapped by an OS (for instance a region that is define as uncached in firmware can be mapped as Normal or Device memory on arm64) and therefore the OS must be given control on how to map the region to match the expected mapping behaviour (eg if a mapping is requested with memory semantics, it must allow unaligned accesses). Rework acpi_os_map_memory() and acpi_os_ioremap() back-end to split them into two separate code paths: acpi_os_memmap() -> memory semantics acpi_os_ioremap() -> MMIO semantics The split allows the architectural implementation back-ends to detect the default memory attributes required by the mapping in question (ie the mapping API defines the semantics memory vs MMIO) and map the memory accordingly. Link: https://lore.kernel.org/linux-arm-kernel/31ffe8fc-f5ee-2858-26c5-0fd8bdd68702@arm.com Signed-off-by: Lorenzo Pieralisi Cc: Ard Biesheuvel Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: "Rafael J. Wysocki" --- arch/arm64/include/asm/acpi.h | 3 +++ arch/arm64/kernel/acpi.c | 19 ++++++++++++++++--- drivers/acpi/osl.c | 23 ++++++++++++++++------- include/acpi/acpi_io.h | 8 ++++++++ 4 files changed, 43 insertions(+), 10 deletions(-) -- 2.31.0 Acked-by: Ard Biesheuvel Acked-by: Hanjun Guo Tested-by: Hanjun Guo diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index bd68e1b7f29f..7535dc7cc5aa 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -50,6 +50,9 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr); void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); #define acpi_os_ioremap acpi_os_ioremap +void __iomem *acpi_os_memmap(acpi_physical_address phys, acpi_size size); +#define acpi_os_memmap acpi_os_memmap + typedef u64 phys_cpuid_t; #define PHYS_CPUID_INVALID INVALID_HWID diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index f3851724fe35..1c9c2f7a1c04 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -273,7 +273,8 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr) return __pgprot(PROT_DEVICE_nGnRnE); } -void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) +static void __iomem *__acpi_os_ioremap(acpi_physical_address phys, + acpi_size size, bool memory) { efi_memory_desc_t *md, *region = NULL; pgprot_t prot; @@ -299,9 +300,11 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) * 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. + * the EFI runtime services. Determine the region default + * attributes by checking the requested memory semantics. */ - prot = __pgprot(PROT_DEVICE_nGnRnE); + prot = memory ? __pgprot(PROT_NORMAL_NC) : + __pgprot(PROT_DEVICE_nGnRnE); if (region) { switch (region->type) { case EFI_LOADER_CODE: @@ -361,6 +364,16 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) return __ioremap(phys, size, prot); } +void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_ioremap(phys, size, false); +} + +void __iomem *acpi_os_memmap(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_ioremap(phys, size, true); +} + /* * Claim Synchronous External Aborts as a firmware first notification. * diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 45c5c0e45e33..6db62f3a390e 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -284,7 +284,8 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) #define should_use_kmap(pfn) page_is_ram(pfn) #endif -static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz) +static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz, + bool memory) { unsigned long pfn; @@ -294,7 +295,8 @@ static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz) return NULL; return (void __iomem __force *)kmap(pfn_to_page(pfn)); } else - return acpi_os_ioremap(pg_off, pg_sz); + return memory ? acpi_os_memmap(pg_off, pg_sz) : + acpi_os_ioremap(pg_off, pg_sz); } static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) @@ -309,9 +311,10 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) } /** - * acpi_os_map_iomem - Get a virtual address for a given physical address range. + * __acpi_os_map_iomem - Get a virtual address for a given physical address range. * @phys: Start of the physical address range to map. * @size: Size of the physical address range to map. + * @memory: true if remapping memory, false if IO * * Look up the given physical address range in the list of existing ACPI memory * mappings. If found, get a reference to it and return a pointer to it (its @@ -321,8 +324,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) * During early init (when acpi_permanent_mmap has not been set yet) this * routine simply calls __acpi_map_table() to get the job done. */ -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +static void __iomem __ref +*__acpi_os_map_iomem(acpi_physical_address phys, acpi_size size, bool memory) { struct acpi_ioremap *map; void __iomem *virt; @@ -353,7 +356,7 @@ void __iomem __ref pg_off = round_down(phys, PAGE_SIZE); pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off; - virt = acpi_map(phys, size); + virt = acpi_map(phys, size, memory); if (!virt) { mutex_unlock(&acpi_ioremap_lock); kfree(map); @@ -372,11 +375,17 @@ void __iomem __ref mutex_unlock(&acpi_ioremap_lock); return map->virt + (phys - map->phys); } + +void __iomem __ref +*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_map_iomem(phys, size, false); +} EXPORT_SYMBOL_GPL(acpi_os_map_iomem); void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { - return (void *)acpi_os_map_iomem(phys, size); + return (void *)__acpi_os_map_iomem(phys, size, true); } EXPORT_SYMBOL_GPL(acpi_os_map_memory); diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index 027faa8883aa..a0212e67d6f4 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -14,6 +14,14 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, } #endif +#ifndef acpi_os_memmap +static inline void __iomem *acpi_os_memmap(acpi_physical_address phys, + acpi_size size) +{ + return ioremap_cache(phys, size); +} +#endif + extern bool acpi_permanent_mmap; void __iomem __ref From patchwork Mon Aug 2 15:23:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 490364 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2027375jas; Mon, 2 Aug 2021 08:24:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrjbcDbiy6qqlhLH8DmOnxgY+HJ4oQcuTs4BJANriXorqGAVfZbgZwGMA2fAJdxcxSSzdA X-Received: by 2002:a05:6e02:1a83:: with SMTP id k3mr1085829ilv.150.1627917860283; Mon, 02 Aug 2021 08:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627917860; cv=none; d=google.com; s=arc-20160816; b=LjyrPXU1MqtZffOhrH3k8CsG2/1QtRz2dkPQI3tAkTfHXVHsLLbuUDR82KbPuvkBbs MfsCdp2VaqA0iVu8SAlUh4izuDoFFFyZYuRka2w7WgSidJi24DIcPP21zAge6ehYc+iS 4cpWxL2uUYJG2QZEERAI1G+3/xFrpCxoAYjG/igVkW6Sx4ZCjUBAVvUWO68/nbHC+VRJ Jr8U1NtWaLBA4Yfl6ce7rvVNKzVcq9L1TaTvYI5aUzZ8F+BHzWmWxDPXfGqKVauTcBUP W1r9NCdfpPT0P5CPguBGRsyrS0qt71gJn4jBTaK4FPI9mOH9fkvXJcoRNFmiJfC4HAoZ m5fw== 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; bh=BOf7JVM9cZ2/Flm9roXx3D2z4TsDdEdCPOyhD6WjFe4=; b=wpbHmBx51qKWsTpmVVIw6PasFSpkgaK4Ue7RQyp3GrjTMdWkYJvWbkNkHGFpy0moYs i9PJ0gbKfPV+LmIS/K9HGz9AgrR6p3nPTfqzhh7KLxunQcY61TNM+t0ZukIJqHoyYFYb YRdQLwQBLzxnt5eYjYonvHbNupo6gI/ctk8ysIDkQCOOoCM1lFMDvGYYnDiJA22YqF5L lzyiXGgip0oxLSDFfZ4vNFdCgU722h8y28+JymiM4Lq4OVhFWyhAbpenlV5GnK7Kgcs1 QLG0FmUr2yR6K8o6/SZpY1lKrWt37aZ/W4Aq/MciTX7ZOCFuOsxViwg5EFOt7ktYB2Ro xkOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i20si1599760jaj.74.2021.08.02.08.24.20; Mon, 02 Aug 2021 08:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235085AbhHBPY2 (ORCPT + 4 others); Mon, 2 Aug 2021 11:24:28 -0400 Received: from foss.arm.com ([217.140.110.172]:37504 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234852AbhHBPY1 (ORCPT ); Mon, 2 Aug 2021 11:24:27 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3F02B12FC; Mon, 2 Aug 2021 08:24:17 -0700 (PDT) Received: from e123427-lin.arm.com (unknown [10.57.39.152]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5AD013F66F; Mon, 2 Aug 2021 08:24:14 -0700 (PDT) From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi , Ard Biesheuvel , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Veronika kabatova , Robin Murphy , Will Deacon , Hanjun Guo , Sudeep Holla , Catalin Marinas Subject: [PATCH v2 2/3] ACPI: osl: Reorder acpi_os_map_iomem() __ref annotation Date: Mon, 2 Aug 2021 16:23:58 +0100 Message-Id: <20210802152359.12623-3-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> References: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The __ref annotation has nothing to do with the acpi_os_map_iomem() return value type. Redefine the acpi_os_map_iomem() function prototype to avoid mixing the __ref annotation with the return type declaration. Signed-off-by: Lorenzo Pieralisi Cc: Ard Biesheuvel Cc: "Rafael J. Wysocki" --- drivers/acpi/osl.c | 4 ++-- include/acpi/acpi_io.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.31.0 diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8f67bf0f090b..fdee0c6f4f7f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -321,8 +321,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) * During early init (when acpi_permanent_mmap has not been set yet) this * routine simply calls __acpi_map_table() to get the job done. */ -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) { struct acpi_ioremap *map; void __iomem *virt; diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index 027faa8883aa..a0094420303f 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -16,8 +16,8 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, extern bool acpi_permanent_mmap; -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size); void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size); From patchwork Mon Aug 2 15:23:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 490365 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2027408jas; Mon, 2 Aug 2021 08:24:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOTS/7XGCKOgLNKBSr47NqYdxecevtjXKhiMyw65CBFJbO6WeTDm/O/ZGTfa0uwEyWud4C X-Received: by 2002:a5d:9e4f:: with SMTP id i15mr856175ioi.58.1627917862953; Mon, 02 Aug 2021 08:24:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627917862; cv=none; d=google.com; s=arc-20160816; b=JIc00voxsk6cRnB65nkpTGOfbS1FwkLiY//4/iruJr+WzSHNVFLpI37wRMpzoM90yg h56w0mTnmWoObeHWzzqAdhKkrqdJCq6usitT2RULjCrPuTwPHTPjoZmkHJMedemxtv3B aYZJyqnhQvdrfSIX0hRqmqmr25NVCyfsapTMBApS31ftYY1sUrODyVSTJ+xFo79q/Jh/ 0GbfzXz1px10ttt4D+Ylz1jazdqwkAe7S0XtnAgA6LbpvNhoXNUviiZfszBJQ2qM2a5D SMyPZE2peR6hw31sHonWNvNbHrZ/9X+pag6VGnHq5EChnu65XAlI/YoK1GTMiLPjpmOb ydBA== 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; bh=B8jSMcaeU+tAJ7Cs/GIPO6mTvjXLwmu+bwixlqBQ4RY=; b=SfjM5wkJMGbm4848PNMpQrZsCWCI0rHrB0V7RSv+IpQbm12wlNV5D3YSU+kqrF0MYA AfNxFnOECIoyWHE/rSRScFGSM0c+5o5GKjEnrR4GMhm6Xc71kASsd43WTPZbBPBzWfre kBlM3WFWfGJ1bdPxDg9h3oQRpbtUHfhRt9tv/3eDyjdP6MI6d0MpjR48kHPuHRUjvOWK qLcmZdA3MRtuBSsw6YOwCMmNtaWvuSyQhg+jbQSsYlQhzarcY5dsU0/h27MlXiLmj0me O5815pfuo8KquWJAtrkmiZVUa6gApYJLhTihsiHMbREuB9qga51EfkDW6LUJdBrEc5xF SEPw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 14si4985155ilt.110.2021.08.02.08.24.22; Mon, 02 Aug 2021 08:24:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235124AbhHBPYa (ORCPT + 4 others); Mon, 2 Aug 2021 11:24:30 -0400 Received: from foss.arm.com ([217.140.110.172]:37516 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235110AbhHBPYa (ORCPT ); Mon, 2 Aug 2021 11:24:30 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5107511D4; Mon, 2 Aug 2021 08:24:20 -0700 (PDT) Received: from e123427-lin.arm.com (unknown [10.57.39.152]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9E1CD3F66F; Mon, 2 Aug 2021 08:24:17 -0700 (PDT) From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi , Hanjun Guo , Ard Biesheuvel , Will Deacon , Sudeep Holla , Catalin Marinas , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Veronika kabatova , Robin Murphy Subject: [PATCH v2 3/3] ACPI: Add memory semantics to acpi_os_map_memory() Date: Mon, 2 Aug 2021 16:23:59 +0100 Message-Id: <20210802152359.12623-4-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> References: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The memory attributes attached to memory regions depend on architecture specific mappings. For some memory regions, the attributes specified by firmware (eg uncached) are not sufficient to determine how a memory region should be mapped by an OS (for instance a region that is define as uncached in firmware can be mapped as Normal or Device memory on arm64) and therefore the OS must be given control on how to map the region to match the expected mapping behaviour (eg if a mapping is requested with memory semantics, it must allow unaligned accesses). Rework acpi_os_map_memory() and acpi_os_ioremap() back-end to split them into two separate code paths: acpi_os_memmap() -> memory semantics acpi_os_ioremap() -> MMIO semantics The split allows the architectural implementation back-ends to detect the default memory attributes required by the mapping in question (ie the mapping API defines the semantics memory vs MMIO) and map the memory accordingly. Link: https://lore.kernel.org/linux-arm-kernel/31ffe8fc-f5ee-2858-26c5-0fd8bdd68702@arm.com Tested-by: Hanjun Guo Signed-off-by: Lorenzo Pieralisi Acked-by: Ard Biesheuvel Cc: Ard Biesheuvel Cc: Will Deacon Cc: Hanjun Guo Cc: Sudeep Holla Cc: Catalin Marinas Cc: "Rafael J. Wysocki" --- arch/arm64/include/asm/acpi.h | 3 +++ arch/arm64/kernel/acpi.c | 19 ++++++++++++++++--- drivers/acpi/osl.c | 23 ++++++++++++++++------- include/acpi/acpi_io.h | 8 ++++++++ 4 files changed, 43 insertions(+), 10 deletions(-) -- 2.31.0 Acked-by: Catalin Marinas diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index bd68e1b7f29f..7535dc7cc5aa 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -50,6 +50,9 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr); void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size); #define acpi_os_ioremap acpi_os_ioremap +void __iomem *acpi_os_memmap(acpi_physical_address phys, acpi_size size); +#define acpi_os_memmap acpi_os_memmap + typedef u64 phys_cpuid_t; #define PHYS_CPUID_INVALID INVALID_HWID diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index f3851724fe35..1c9c2f7a1c04 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -273,7 +273,8 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr) return __pgprot(PROT_DEVICE_nGnRnE); } -void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) +static void __iomem *__acpi_os_ioremap(acpi_physical_address phys, + acpi_size size, bool memory) { efi_memory_desc_t *md, *region = NULL; pgprot_t prot; @@ -299,9 +300,11 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) * 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. + * the EFI runtime services. Determine the region default + * attributes by checking the requested memory semantics. */ - prot = __pgprot(PROT_DEVICE_nGnRnE); + prot = memory ? __pgprot(PROT_NORMAL_NC) : + __pgprot(PROT_DEVICE_nGnRnE); if (region) { switch (region->type) { case EFI_LOADER_CODE: @@ -361,6 +364,16 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) return __ioremap(phys, size, prot); } +void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_ioremap(phys, size, false); +} + +void __iomem *acpi_os_memmap(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_ioremap(phys, size, true); +} + /* * Claim Synchronous External Aborts as a firmware first notification. * diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index fdee0c6f4f7f..2fcd3bb9a3c1 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -284,7 +284,8 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) #define should_use_kmap(pfn) page_is_ram(pfn) #endif -static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz) +static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz, + bool memory) { unsigned long pfn; @@ -294,7 +295,8 @@ static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz) return NULL; return (void __iomem __force *)kmap(pfn_to_page(pfn)); } else - return acpi_os_ioremap(pg_off, pg_sz); + return memory ? acpi_os_memmap(pg_off, pg_sz) : + acpi_os_ioremap(pg_off, pg_sz); } static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) @@ -309,9 +311,10 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) } /** - * acpi_os_map_iomem - Get a virtual address for a given physical address range. + * __acpi_os_map_iomem - Get a virtual address for a given physical address range. * @phys: Start of the physical address range to map. * @size: Size of the physical address range to map. + * @memory: true if remapping memory, false if IO * * Look up the given physical address range in the list of existing ACPI memory * mappings. If found, get a reference to it and return a pointer to it (its @@ -321,8 +324,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) * During early init (when acpi_permanent_mmap has not been set yet) this * routine simply calls __acpi_map_table() to get the job done. */ -void __iomem *__ref -acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +static void __iomem *__ref +__acpi_os_map_iomem(acpi_physical_address phys, acpi_size size, bool memory) { struct acpi_ioremap *map; void __iomem *virt; @@ -353,7 +356,7 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) pg_off = round_down(phys, PAGE_SIZE); pg_sz = round_up(phys + size, PAGE_SIZE) - pg_off; - virt = acpi_map(phys, size); + virt = acpi_map(phys, size, memory); if (!virt) { mutex_unlock(&acpi_ioremap_lock); kfree(map); @@ -372,11 +375,17 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) mutex_unlock(&acpi_ioremap_lock); return map->virt + (phys - map->phys); } + +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +{ + return __acpi_os_map_iomem(phys, size, false); +} EXPORT_SYMBOL_GPL(acpi_os_map_iomem); void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size) { - return (__force void *)acpi_os_map_iomem(phys, size); + return (__force void *)__acpi_os_map_iomem(phys, size, true); } EXPORT_SYMBOL_GPL(acpi_os_map_memory); diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index a0094420303f..b69a2a1c144c 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -14,6 +14,14 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, } #endif +#ifndef acpi_os_memmap +static inline void __iomem *acpi_os_memmap(acpi_physical_address phys, + acpi_size size) +{ + return ioremap_cache(phys, size); +} +#endif + extern bool acpi_permanent_mmap; void __iomem *__ref