Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933789AbbGUV7z (ORCPT ); Tue, 21 Jul 2015 17:59:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37248 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932148AbbGUV7w (ORCPT ); Tue, 21 Jul 2015 17:59:52 -0400 From: "Jonathan (Zhixiong) Zhang" To: catalin.marinas@arm.com, will.deacon@arm.com, fu.wei@linaro.org, al.stone@linaro.org, "bp @ alien8 . de Matt Fleming" , rjw@rjwysocki.net Cc: "Jonathan (Zhixiong) Zhang" , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org Subject: [PATCH V7 4/5] arm64: apei: implement arch_apei_get_mem_attributes() Date: Tue, 21 Jul 2015 14:59:19 -0700 Message-Id: <1437515960-16812-5-git-send-email-zjzhang@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1437515960-16812-1-git-send-email-zjzhang@codeaurora.org> References: <1437515960-16812-1-git-send-email-zjzhang@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2301 Lines: 70 From: "Jonathan (Zhixiong) Zhang" If the physical address has memory attributes defined by EFI memmap as EFI_MEMORY_UC, the page protection type is PROT_DEVICE_nGnRE. Otherwise, the page protection type is PAGE_KERNEL. Signed-off-by: Jonathan (Zhixiong) Zhang --- This patch applies cleanly to efi-next-14364 of efi/next and arm64-upstream-13521 of arm64/master, but needed slight change to apply to next-20150720 of linux-next/master and pm+acpi-4.2-rc3 of linux-pm/master. The later two branches has newer arch/arm64/include/asm/acpi.h with following patch: b6cfb277378e ACPI / ARM64: add BAD_MADT_GICC_ENTRY() macro --- arch/arm64/include/asm/acpi.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 1ff9e6eb5e02..41c7623d5b84 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -19,6 +19,11 @@ #include #include +#ifdef CONFIG_ACPI_APEI +#include +#include +#endif + /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI /* ACPI table mapping after acpi_gbl_permanent_mmap is set */ @@ -84,4 +89,25 @@ static inline const char *acpi_get_enable_method(int cpu) { return acpi_psci_present() ? "psci" : NULL; } +#ifdef CONFIG_ACPI_APEI +/* + * According to "Table 8 Map: EFI memory types to AArch64 memory types" + * of UEFI 2.5 section 2.3.6.1, each EFI memory type is mapped to + * corresponding MAIR attribute encoding. + */ +static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) +{ + pgprot_t prot; + + prot = efi_mem_attributes(addr); + if (prot & EFI_MEMORY_UC) + return PROT_DEVICE_nGnRnE; + if (prot & EFI_MEMORY_WC) + return PROT_NORMAL_NC; + if (prot & EFI_MEMORY_WT) + return PROT_NORMAL_WT; + return PAGE_KERNEL; +} +#endif + #endif /*_ASM_ACPI_H*/ -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/