From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754007AbbHFNlL (ORCPT ); Thu, 6 Aug 2015 09:41:11 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49873 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891AbbHFNlH (ORCPT ); Thu, 6 Aug 2015 09:41:07 -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, hanjun.guo@linaro.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Cc: "Jonathan (Zhixiong) Zhang" , linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, timur@codeaurora.org Subject: [PATCH V10 4/5] arm64: apei: implement arch_apei_get_mem_attributes() Date: Thu, 6 Aug 2015 06:40:33 -0700 Message-Id: <1438868434-28736-5-git-send-email-zjzhang@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1438868434-28736-1-git-send-email-zjzhang@codeaurora.org> References: <1438868434-28736-1-git-send-email-zjzhang@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Jonathan (Zhixiong) Zhang" Table 8 of UEFI 2.5 section 2.3.6.1 defines mappings from EFI memory types to MAIR attribute encodings for arm64. If the physical address has memory attributes defined by EFI memmap as EFI_MEMORY_[UC|WC|WT], return approprate page protection type according to the UEFI spec. Otherwise, return PAGE_KERNEL. Reviewed-by: Catalin Marinas Acked-by: Hanjun Guo Signed-off-by: Jonathan (Zhixiong) Zhang --- This patch as is does not build on current tip of next branch of git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git, a small tweak is needed. It builds on tip of linux-next/master of linus' repo and origin/master of arm64 repo. --- 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..1025d0401016 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 + /* Macros for consistency checks of the GICC subtable of MADT */ #define ACPI_MADT_GICC_LENGTH \ (acpi_gbl_FADT.header.revision < 6 ? 76 : 80) @@ -91,4 +95,26 @@ 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) +{ + u64 attr; + + attr = efi_mem_attributes(addr); + if (attr & EFI_MEMORY_UC) + return __pgprot(PROT_DEVICE_nGnRnE); + if (attr & EFI_MEMORY_WC) + return __pgprot(PROT_NORMAL_NC); + if (attr & EFI_MEMORY_WT) + return __pgprot(PROT_NORMAL_WT); + return __pgprot(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