From: "Luck, Tony" <tony.luck@intel.com> To: Borislav Petkov <bp@alien8.de> Cc: Arnd Bergmann <arnd@arndb.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, qiuxu.zhuo@intel.com, linux-edac@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: [PATCH] EDAC, skx: Better fix for randconfig builds Date: Tue, 6 Nov 2018 10:39:15 -0800 [thread overview] Message-ID: <20181106183914.GA26731@agluck-desk> (raw) In-Reply-To: <20181106143253.GH13712@zn.tnic> On Tue, Nov 06, 2018 at 03:32:53PM +0100, Borislav Petkov wrote: > On Tue, Nov 06, 2018 at 02:44:42PM +0100, Arnd Bergmann wrote: > > No, it was unintentional, the 'if ACPI' can be dropped when we add > > 'depends on ACPI'. > > So I have one fix already which takes care of non-sensical configs. If > you or Tony wanna make it prettier, feel free to test it thoroughly and > send me a patch ontop of > > https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=for-next > 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: a324e9396ca3 ("EDAC, skx: Fix randconfig builds") Signed-off-by: Tony Luck <tony.luck@intel.com> --- drivers/edac/Kconfig | 4 ++-- include/linux/adxl.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index ec2727b27556..e286b5b99003 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -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 diff --git a/include/linux/adxl.h b/include/linux/adxl.h index 2d29f55923e3..2a629acb4c3f 100644 --- a/include/linux/adxl.h +++ b/include/linux/adxl.h @@ -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 */ -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: "Luck, Tony" <tony.luck@intel.com> To: Borislav Petkov <bp@alien8.de> Cc: Arnd Bergmann <arnd@arndb.de>, Mauro Carvalho Chehab <mchehab@kernel.org>, qiuxu.zhuo@intel.com, linux-edac@vger.kernel.org, Linux Kernel Mailing List <linux-kernel@vger.kernel.org> Subject: EDAC, skx: Better fix for randconfig builds Date: Tue, 6 Nov 2018 10:39:15 -0800 [thread overview] Message-ID: <20181106183914.GA26731@agluck-desk> (raw) On Tue, Nov 06, 2018 at 03:32:53PM +0100, Borislav Petkov wrote: > On Tue, Nov 06, 2018 at 02:44:42PM +0100, Arnd Bergmann wrote: > > No, it was unintentional, the 'if ACPI' can be dropped when we add > > 'depends on ACPI'. > > So I have one fix already which takes care of non-sensical configs. If > you or Tony wanna make it prettier, feel free to test it thoroughly and > send me a patch ontop of > > https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=for-next > 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: a324e9396ca3 ("EDAC, skx: Fix randconfig builds") Signed-off-by: Tony Luck <tony.luck@intel.com> --- drivers/edac/Kconfig | 4 ++-- include/linux/adxl.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index ec2727b27556..e286b5b99003 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -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 diff --git a/include/linux/adxl.h b/include/linux/adxl.h index 2d29f55923e3..2a629acb4c3f 100644 --- a/include/linux/adxl.h +++ b/include/linux/adxl.h @@ -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 */
next prev parent reply other threads:[~2018-11-06 18:39 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-02 15:32 [PATCH] EDAC: skx_edac: add ACPI dependency Arnd Bergmann 2018-11-02 15:32 ` Arnd Bergmann 2018-11-02 16:10 ` [PATCH] " Borislav Petkov 2018-11-02 16:10 ` Borislav Petkov 2018-11-02 17:39 ` [PATCH] " Luck, Tony 2018-11-02 17:39 ` Luck, Tony 2018-11-02 23:42 ` [PATCH] " Borislav Petkov 2018-11-02 23:42 ` Borislav Petkov 2018-11-06 13:44 ` [PATCH] " Arnd Bergmann 2018-11-06 13:44 ` Arnd Bergmann 2018-11-06 14:32 ` [PATCH] " Borislav Petkov 2018-11-06 14:32 ` Borislav Petkov 2018-11-06 18:39 ` Luck, Tony [this message] 2018-11-06 18:39 ` EDAC, skx: Better fix for randconfig builds Luck, Tony 2018-11-07 22:03 ` [PATCH] " Borislav Petkov 2018-11-07 22:03 ` Borislav Petkov
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=20181106183914.GA26731@agluck-desk \ --to=tony.luck@intel.com \ --cc=arnd@arndb.de \ --cc=bp@alien8.de \ --cc=linux-edac@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mchehab@kernel.org \ --cc=qiuxu.zhuo@intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.