Skip to contentSkip to conversation

platform/x86: dell-smbios: fix DCDBAS dependency, better

PATCH In review Arnd Bergmann 2 participants 2 messages Mar 13, 2018 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 platform/x86: dell-smbios: fix DCDBAS dependency, better

The rework of the dell laptop modules caused a link error:

drivers/platform/x86/dell-smbios-smm.o: In function `dell_smbios_smm_call':
dell-smbios-smm.c:(.text+0x77): undefined reference to `dcdbas_smi_request'

We already have a fix for that, but this was only a partial solution, since CONFIG_DELL_LAPTOP and CONFIG_DELL_WMI select CONFIG_DELL_SMBIOS regardless of that dependency.

We can either add the same 'DCDBAS || DCDBAS=n' dependency for those two as well, or replace the 'select' with a 'depends on'. The second approach seems cleaner, so I'm picking that here.

Fixes 32d7b19bad96 ("platform/x86: dell-smbios: Resolve dependency error on DCDBAS")
Fixes 25d47027e100 ("platform/x86: dell-smbios: Link all dell-smbios-* modules together")
---
 drivers/platform/x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/Kconfig +2 -2
index 28905793b5e5..0aec62bb5c61 100644
@@ -151,7 +151,7 @@ config DELL_LAPTOP
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on RFKILL || RFKILL = n
 	depends on SERIO_I8042
-	select DELL_SMBIOS
+	depends on DELL_SMBIOS
 	select POWER_SUPPLY
 	select LEDS_CLASS
 	select NEW_LEDS
@@ -165,8 +165,8 @@ config DELL_WMI
 	depends on DMI
 	depends on INPUT
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
+	depends on DELL_SMBIOS
 	select DELL_WMI_DESCRIPTOR
-	select DELL_SMBIOS
 	select INPUT_SPARSEKMAP
 	---help---
 	  Say Y here if you want to support WMI-based hotkeys on Dell laptops.
Signature · 1 line
2.9.0
#1 lore raw
Quoted 5 lines · Arnd Bergmann

The rework of the dell laptop modules caused a link error:

drivers/platform/x86/dell-smbios-smm.o: In function `dell_smbios_smm_call':
dell-smbios-smm.c:(.text+0x77): undefined reference to `dcdbas_smi_request'

Quoted 7 lines

We already have a fix for that, but this was only a partial solution, since CONFIG_DELL_LAPTOP and CONFIG_DELL_WMI select CONFIG_DELL_SMBIOS regardless of that dependency.

We can either add the same 'DCDBAS || DCDBAS=n' dependency for those two as well, or replace the 'select' with a 'depends on'. The second approach seems cleaner, so I'm picking that here.

Thanks Arnd,

This thing has gotten out of hand. We're working on some additional fixes related driver loading order when built-in as well. There is a similar dependency on ACPI_WMI too.

I have a patch out pending review/testing on that.

We were trying to avoid having SMBIOS being required to be selected in order for Dell Laptop to appear in the menu. Similarly for Dell WMI Hotkeys.

I'm awaiting some feedback, but at the moment, it is looking like we will have to revert the patches you cite below, and try again in 4.17, likely with a DELL_EXTRAS menuconfig which allows us to default things like DELL_SMBIOS to m and present a more intuitive config menu.

Quoted 35 lines
Fixes 32d7b19bad96 ("platform/x86: dell-smbios: Resolve dependency error on DCDBAS")
Fixes 25d47027e100 ("platform/x86: dell-smbios: Link all dell-smbios-* modules together")
---
 drivers/platform/x86/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/Kconfig +2 -2
index 28905793b5e5..0aec62bb5c61 100644
@@ -151,7 +151,7 @@ config DELL_LAPTOP
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
 	depends on RFKILL || RFKILL = n
 	depends on SERIO_I8042
-	select DELL_SMBIOS
+	depends on DELL_SMBIOS
 	select POWER_SUPPLY
 	select LEDS_CLASS
 	select NEW_LEDS
@@ -165,8 +165,8 @@ config DELL_WMI
 	depends on DMI
 	depends on INPUT
 	depends on ACPI_VIDEO || ACPI_VIDEO = n
+	depends on DELL_SMBIOS
 	select DELL_WMI_DESCRIPTOR
-	select DELL_SMBIOS
 	select INPUT_SPARSEKMAP
 	---help---
 	  Say Y here if you want to support WMI-based hotkeys on Dell laptops.
Signature · 1 line
2.9.0
Signature · 2 lines
Darren Hart
VMware Open Source Technology Center