Commit 24c9d423 authored Nov 06, 2018 by Luck, Tony Committed by Borislav Petkov Nov 07, 2018

EDAC, skx: Fix randconfig builds in a better way



It was previously noted that Kconfig complained about unmet dependencies
when trying to configure skx_edac together with CONFIG_ACPI=n. First fix
for this checked for ACPI when doing

  select ACPI_ADXL

but this required stub functions for the case where ACPI wasn't
selected. It also allowed building a driver that didn't actually work
for a system that has non-volatile DIMMs.

Arnd Bergmann pointed out that the right fix is to make EDAC_SKX
"depend on ACPI".

Fixes: a324e939 ("EDAC, skx: Fix randconfig builds")
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
CC: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
CC: Arnd Bergmann <arnd@arndb.de>
CC: Mauro Carvalho Chehab <mchehab@kernel.org>
CC: linux-edac <linux-edac@vger.kernel.org>
CC: qiuxu.zhuo@intel.com
Link: http://lkml.kernel.org/r/20181106183914.GA26731@agluck-desk

parent 96c1c58e

drivers/edac/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -231,10 +231,10 @@ config EDAC_SBRIDGE

		config EDAC_SKX
		tristate "Intel Skylake server Integrated MC"
		depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG
		depends on PCI && X86_64 && X86_MCE_INTEL && PCI_MMCONFIG && ACPI
		depends on ACPI_NFIT \|\| !ACPI_NFIT # if ACPI_NFIT=m, EDAC_SKX can't be y
		select DMI
		select ACPI_ADXL if ACPI
		select ACPI_ADXL
		help
		Support for error detection and correction the Intel
		Skylake server Integrated Memory Controllers. If your

include/linux/adxl.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -7,12 +7,7 @@
		#ifndef _LINUX_ADXL_H
		#define _LINUX_ADXL_H

		#ifdef CONFIG_ACPI_ADXL
		const char * const *adxl_get_component_names(void);
		int adxl_decode(u64 addr, u64 component_values[]);
		#else
		static inline const char * const *adxl_get_component_names(void) { return NULL; }
		static inline int adxl_decode(u64 addr, u64 component_values[]) { return -EOPNOTSUPP; }
		#endif

		#endif /* _LINUX_ADXL_H */

Admin message