From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753014AbbINMTd (ORCPT ); Mon, 14 Sep 2015 08:19:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34807 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbbINMTb (ORCPT ); Mon, 14 Sep 2015 08:19:31 -0400 Date: Mon, 14 Sep 2015 05:18:40 -0700 From: "tip-bot for Jonathan (Zhixiong) Zhang" Message-ID: Cc: hpa@zytor.com, hanjun.guo@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, matt.fleming@intel.com, peterz@infradead.org, ard.biesheuvel@linaro.org, catalin.marinas@arm.com, zjzhang@codeaurora.org, will.deacon@arm.com, torvalds@linux-foundation.org Reply-To: hanjun.guo@linaro.org, hpa@zytor.com, matt.fleming@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, will.deacon@arm.com, ard.biesheuvel@linaro.org, peterz@infradead.org, zjzhang@codeaurora.org, catalin.marinas@arm.com In-Reply-To: <1441372302-23242-2-git-send-email-matt@codeblueprint.co.uk> References: <1441372302-23242-2-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/efi] arm64, acpi/apei: Implement arch_apei_get_mem_attributes() Git-Commit-ID: 89e44b51cc0db50ea4b5bbb5d582c4db88bbaed8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 89e44b51cc0db50ea4b5bbb5d582c4db88bbaed8 Gitweb: http://git.kernel.org/tip/89e44b51cc0db50ea4b5bbb5d582c4db88bbaed8 Author: Jonathan (Zhixiong) Zhang AuthorDate: Fri, 4 Sep 2015 14:11:41 +0100 Committer: Ingo Molnar CommitDate: Mon, 14 Sep 2015 11:40:03 +0200 arm64, acpi/apei: Implement arch_apei_get_mem_attributes() 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. Signed-off-by: Jonathan (Zhixiong) Zhang Signed-off-by: Matt Fleming [ Small stylistic tweaks. ] Reviewed-by: Matt Fleming Reviewed-by: Ard Biesheuvel Reviewed-by: Catalin Marinas Acked-by: Hanjun Guo Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Will Deacon Link: http://lkml.kernel.org/r/1441372302-23242-2-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/arm64/include/asm/acpi.h | 5 +++++ arch/arm64/kernel/acpi.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 406485e..5aa892a 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -92,4 +92,9 @@ static inline const char *acpi_get_enable_method(int cpu) { return acpi_psci_present() ? "psci" : NULL; } + +#ifdef CONFIG_ACPI_APEI +pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); +#endif + #endif /*_ASM_ACPI_H*/ diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 19de753..137d537 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -29,6 +29,11 @@ #include #include +#ifdef CONFIG_ACPI_APEI +# include +# include +#endif + int acpi_noirq = 1; /* skip ACPI IRQ initialization */ int acpi_disabled = 1; EXPORT_SYMBOL(acpi_disabled); @@ -230,3 +235,27 @@ void __init acpi_gic_init(void) early_acpi_os_unmap_memory((char *)table, tbl_size); } + +#ifdef CONFIG_ACPI_APEI +pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) +{ + /* + * 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 a corresponding MAIR attribute encoding. + * The EFI memory attribute advises all possible capabilities + * of a memory region. We use the most efficient capability. + */ + + u64 attr; + + attr = efi_mem_attributes(addr); + if (attr & EFI_MEMORY_WB) + return PAGE_KERNEL; + if (attr & EFI_MEMORY_WT) + return __pgprot(PROT_NORMAL_WT); + if (attr & EFI_MEMORY_WC) + return __pgprot(PROT_NORMAL_NC); + return __pgprot(PROT_DEVICE_nGnRnE); +} +#endif