From patchwork Tue Dec 15 16:59:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kani, Toshi" X-Patchwork-Id: 7855971 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F3E8ABEEE1 for ; Tue, 15 Dec 2015 16:59:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20D7A203E6 for ; Tue, 15 Dec 2015 16:59:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9275A203A5 for ; Tue, 15 Dec 2015 16:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751516AbbLOQ7W (ORCPT ); Tue, 15 Dec 2015 11:59:22 -0500 Received: from g4t3426.houston.hp.com ([15.201.208.54]:31041 "EHLO g4t3426.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121AbbLOQ7V (ORCPT ); Tue, 15 Dec 2015 11:59:21 -0500 Received: from g4t3433.houston.hp.com (g4t3433.houston.hp.com [16.210.25.219]) by g4t3426.houston.hp.com (Postfix) with ESMTP id 784A260; Tue, 15 Dec 2015 16:59:20 +0000 (UTC) Received: from misato.fc.hp.com (misato.fc.hp.com [16.78.168.61]) by g4t3433.houston.hp.com (Postfix) with ESMTP id 9DD415F; Tue, 15 Dec 2015 16:59:19 +0000 (UTC) From: Toshi Kani To: rjw@rjwysocki.net, dan.j.williams@intel.com Cc: elliott@hpe.com, linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Toshi Kani Subject: [PATCH RESEND] ACPI/Kconfig: Make ACPI_NFIT depend on EFI_STUB on X86 Date: Tue, 15 Dec 2015 09:59:06 -0700 Message-Id: <1450198746-14161-1-git-send-email-toshi.kani@hpe.com> X-Mailer: git-send-email 2.4.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ACPI 6.0 defines NFIT table and new persistent memory types for EFI memory table (EFI_PERSISTENT_MEMORY) and e820 table (E820_PMEM). setup_e820() enabled by EFI_STUB converts EFI_PERSISTENT_MEMORY to E820_PMEM for the e820_map table on x86 EFI platforms. When EFI_STUB is disabled, x86 kernels rely on the bootloader to perform this conversion. It was found that the upstream grub bootloader since 2012 has a bug that converts EFI_PERSISTENT_MEMORY (or any new type) to E820_RAM, which causes the kernel to use persistent memory ranges as regular memory and corrupts the data in NVDIMM. Therefore, this patch sets ACPI_NFIT to depend on EFI_STUB on x86. This assures that ACPI_NFIT kernels are self-contained and are protected from the upstream grub bug on x86. Note, X86_PMEM_LEGACY allows the kernel to use the pmem driver on pre-ACPI 6.0 platforms, and does not require ACPI_NFIT enabled. References: http://www.mail-archive.com/grub-devel@gnu.org/msg23961.html Reported-by: Robert Elliott Signed-off-by: Toshi Kani Cc: Rafael J. Wysocki Cc: Dan Williams --- drivers/acpi/Kconfig | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 5eef4cb..5368baa 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -441,6 +441,7 @@ config ACPI_NFIT depends on PHYS_ADDR_T_64BIT depends on BLK_DEV depends on ARCH_HAS_MMIO_FLUSH + depends on !X86 || (X86 && EFI_STUB) select LIBNVDIMM help Infrastructure to probe ACPI 6 compliant platforms for