From: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org>
To: catalin.marinas@arm.com, will.deacon@arm.com, fu.wei@linaro.org,
al.stone@linaro.org, bp@alien8.de,
Matt Fleming <matt.fleming@intel.com>,
rjw@rjwysocki.net, hanjun.guo@linaro.org,
leif.lindholm@linaro.org, ard.biesheuvel@linaro.org
Cc: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org>,
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 [thread overview]
Message-ID: <1438868434-28736-5-git-send-email-zjzhang@codeaurora.org> (raw)
In-Reply-To: <1438868434-28736-1-git-send-email-zjzhang@codeaurora.org>
From: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org>
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 <catalin.marinas@arm.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Jonathan (Zhixiong) Zhang <zjzhang@codeaurora.org>
---
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 <asm/psci.h>
#include <asm/smp_plat.h>
+#ifdef CONFIG_ACPI_APEI
+#include <linux/efi.h>
+#include <asm/pgtable.h>
+#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
next prev parent reply other threads:[~2015-08-06 13:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-06 13:40 [PATCH V10 0/5] map GHES memory region according to EFI memory map Jonathan (Zhixiong) Zhang
2015-08-06 13:40 ` [PATCH V10 1/5] efi: x86: rearrange efi_mem_attributes() Jonathan (Zhixiong) Zhang
2015-08-06 13:40 ` [PATCH V10 2/5] x86: acpi: implement arch_apei_get_mem_attributes() Jonathan (Zhixiong) Zhang
2015-08-06 13:40 ` [PATCH V10 3/5] arm64: mm: add PROT_DEVICE_nGnRnE and PROT_NORMAL_WT Jonathan (Zhixiong) Zhang
2015-08-06 13:40 ` Jonathan (Zhixiong) Zhang [this message]
2015-08-07 9:00 ` [PATCH V10 4/5] arm64: apei: implement arch_apei_get_mem_attributes() Ard Biesheuvel
2015-08-07 9:37 ` Matt Fleming
2015-08-07 9:50 ` Ard Biesheuvel
2015-08-07 18:16 ` Zhang, Jonathan Zhixiong
2015-08-07 18:57 ` Matt Fleming
2015-08-08 8:11 ` Ard Biesheuvel
2015-08-08 16:34 ` Zhang, Jonathan Zhixiong
2015-08-07 17:40 ` Zhang, Jonathan Zhixiong
2015-08-07 18:50 ` Matt Fleming
2015-08-06 13:40 ` [PATCH V10 5/5] acpi, apei: use appropriate pgprot_t to map GHES memoryTo: Matt Fleming <matt.fleming@intel.com>, Thomas Gleixner <tglx@linutronix.de>, fu.wei@linaro.org, al.stone@linaro.org, bp@alien8.de, tony.luck@gmail.com, hanjun.guo@linaro.org rjw@rjwysocki.net, lenb@kernel.org, ying.huang@intel.com, catalin.marinas@arm.com, will.deacon@arm.com Jonathan (Zhixiong) Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438868434-28736-5-git-send-email-zjzhang@codeaurora.org \
--to=zjzhang@codeaurora.org \
--cc=al.stone@linaro.org \
--cc=ard.biesheuvel@linaro.org \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=fu.wei@linaro.org \
--cc=hanjun.guo@linaro.org \
--cc=leif.lindholm@linaro.org \
--cc=linaro-acpi@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=rjw@rjwysocki.net \
--cc=timur@codeaurora.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome