From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751906AbbHQVIz (ORCPT ); Mon, 17 Aug 2015 17:08:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:46441 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078AbbHQVIw (ORCPT ); Mon, 17 Aug 2015 17:08:52 -0400 From: "Jonathan (Zhixiong) Zhang" To: Will Deacon , Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" , "linux-kernel @ vger . kernel . org" , "linux-efi @ vger . kernel . org" , Matt Fleming , Borislav Petkov , Ard Biesheuvel , Catalin Marinas , Matt Fleming Cc: "Jonathan (Zhixiong) Zhang" Subject: [PATCH V3 2/2] acpi, apei: use appropriate pgprot_t to map GHES memory Date: Mon, 17 Aug 2015 14:08:41 -0700 Message-Id: <1439845721-30196-2-git-send-email-zjzhang@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1439845721-30196-1-git-send-email-zjzhang@codeaurora.org> References: <1439845721-30196-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" With ACPI APEI firmware first handling, generic hardware error record is updated by firmware in GHES memory region. On an arm64 platform, firmware updates GHES memory region with uncached access attribute, and then Linux reads stale data from cache. With current code, GHES memory region is mapped with PAGE_KERNEL based on the assumption that cache coherency of GHES memory region is maintained by firmware on all platforms. This assumption is not true for above mentioned arm64 platform. Instead GHES memory region should be mapped with page protection type according to what is returned from arch_apei_get_mem_attribute(). Reviewed-by: Matt Fleming Acked-by: Borislav Petkov Signed-off-by: Jonathan (Zhixiong) Zhang --- drivers/acpi/apei/ghes.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 23981ac1c6c2..3dd9c462d22a 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -157,11 +157,15 @@ static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn) static void __iomem *ghes_ioremap_pfn_irq(u64 pfn) { - unsigned long vaddr; + unsigned long vaddr, paddr; + pgprot_t prot; vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr); - ioremap_page_range(vaddr, vaddr + PAGE_SIZE, - pfn << PAGE_SHIFT, PAGE_KERNEL); + + paddr = pfn << PAGE_SHIFT; + prot = arch_apei_get_mem_attribute(paddr); + + ioremap_page_range(vaddr, vaddr + PAGE_SIZE, paddr, prot); return (void __iomem *)vaddr; } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project