| Message ID | 1524246131-17621-1-git-send-email-mario.limonciello@dell.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Darren Hart |
| Headers | show |
On 04/20/18 10:42, Mario Limonciello wrote: > As reported by Randy Dunlap: >>> WARNING: unmet direct dependencies detected for DELL_SMBIOS >>> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] >>> && (DCDBAS [=m] || >>> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) >>> Selected by [y]: >>> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] >>> && DMI [=y] >>> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || >>> ACPI_VIDEO [=n]=n) >>> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] >>> > > Right now it's possible to set dell laptop to compile in but this > causes dell-smbios to compile in which breaks if dcdbas is a module. > > Dell laptop shouldn't select dell-smbios anymore, but depend on it. > > Fixes: 32d7b19 (platform/x86: dell-smbios: Resolve dependency error on DCDBAS) meta-comment: the SHA-1 ID should be the first 12 characters of the commit ID according to Documentation/process/submitting-patches.rst. > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> Tested-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > drivers/platform/x86/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 39d06dd..bc309c5 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -154,7 +154,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 >
> -----Original Message----- > From: platform-driver-x86-owner@vger.kernel.org [mailto:platform-driver-x86- > owner@vger.kernel.org] On Behalf Of Randy Dunlap > Sent: Friday, April 20, 2018 12:53 PM > To: Limonciello, Mario; dvhart@infradead.org; Andy Shevchenko > Cc: LKML; platform-driver-x86@vger.kernel.org > Subject: Re: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. > > On 04/20/18 10:42, Mario Limonciello wrote: > > As reported by Randy Dunlap: > >>> WARNING: unmet direct dependencies detected for DELL_SMBIOS > >>> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] > >>> && (DCDBAS [=m] || > >>> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) > >>> Selected by [y]: > >>> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] > >>> && DMI [=y] > >>> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || > >>> ACPI_VIDEO [=n]=n) > >>> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] > >>> > > > > Right now it's possible to set dell laptop to compile in but this > > causes dell-smbios to compile in which breaks if dcdbas is a module. > > > > Dell laptop shouldn't select dell-smbios anymore, but depend on it. > > > > Fixes: 32d7b19 (platform/x86: dell-smbios: Resolve dependency error on > DCDBAS) > > meta-comment: the SHA-1 ID should be the first 12 characters of the commit ID > according to Documentation/process/submitting-patches.rst. Thanks for letting me, I didn't realize that. Darren, let me know if you want me to resubmit with this adjustment or if you can adjust when you queue for testing. > > > > Reported-by: Randy Dunlap <rdunlap@infradead.org> > > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> > > Tested-by: Randy Dunlap <rdunlap@infradead.org> > > Thanks. > > > --- > > drivers/platform/x86/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > > index 39d06dd..bc309c5 100644 > > --- a/drivers/platform/x86/Kconfig > > +++ b/drivers/platform/x86/Kconfig > > @@ -154,7 +154,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 > > > > > -- > ~Randy
On Fri, Apr 20, 2018 at 12:42:11PM -0500, Mario Limonciello wrote: > As reported by Randy Dunlap: > >> WARNING: unmet direct dependencies detected for DELL_SMBIOS > >> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] > >> && (DCDBAS [=m] || > >> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) > >> Selected by [y]: > >> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] > >> && DMI [=y] > >> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || > >> ACPI_VIDEO [=n]=n) > >> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] > >> > > Right now it's possible to set dell laptop to compile in but this > causes dell-smbios to compile in which breaks if dcdbas is a module. > > Dell laptop shouldn't select dell-smbios anymore, but depend on it. Ugh. Indeed. One of the goals of the previous maelstrom of dell* kconfig depencency changes was to make it so DELL_LAPTOP was visible without having to toggle DELL_SMBIOS*. But, having "select DELL_SMBIOS" avoids the dependency check causing this failure (I'm surprised and dismayed this made it through all the config permutation testing this saw). I'll apply this patch, and I guess it should go to stable, and for the next version I think it's time for a new "CONFIG DELL_EXTRAS" which will allow us to default DELL_SMBIOS to y and make the menu more consistent. Thank you for the catch. Grrrrrr :-(
On Fri, Apr 20, 2018 at 05:55:28PM +0000, Mario.Limonciello@dell.com wrote: > > > -----Original Message----- > > From: platform-driver-x86-owner@vger.kernel.org [mailto:platform-driver-x86- > > owner@vger.kernel.org] On Behalf Of Randy Dunlap > > Sent: Friday, April 20, 2018 12:53 PM > > To: Limonciello, Mario; dvhart@infradead.org; Andy Shevchenko > > Cc: LKML; platform-driver-x86@vger.kernel.org > > Subject: Re: [PATCH] platform/x86: Kconfig: Fix dell-laptop dependency chain. > > > > On 04/20/18 10:42, Mario Limonciello wrote: > > > As reported by Randy Dunlap: > > >>> WARNING: unmet direct dependencies detected for DELL_SMBIOS > > >>> Depends on [m]: X86 [=y] && X86_PLATFORM_DEVICES [=y] > > >>> && (DCDBAS [=m] || > > >>> DCDBAS [=m]=n) && (ACPI_WMI [=n] || ACPI_WMI [=n]=n) > > >>> Selected by [y]: > > >>> - DELL_LAPTOP [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] > > >>> && DMI [=y] > > >>> && BACKLIGHT_CLASS_DEVICE [=y] && (ACPI_VIDEO [=n] || > > >>> ACPI_VIDEO [=n]=n) > > >>> && (RFKILL [=n] || RFKILL [=n]=n) && SERIO_I8042 [=y] > > >>> > > > > > > Right now it's possible to set dell laptop to compile in but this > > > causes dell-smbios to compile in which breaks if dcdbas is a module. > > > > > > Dell laptop shouldn't select dell-smbios anymore, but depend on it. > > > > > > Fixes: 32d7b19 (platform/x86: dell-smbios: Resolve dependency error on > > DCDBAS) > > > > meta-comment: the SHA-1 ID should be the first 12 characters of the commit ID > > according to Documentation/process/submitting-patches.rst. > > Thanks for letting me, I didn't realize that. > > Darren, let me know if you want me to resubmit with this adjustment or if you > can adjust when you queue for testing. Will fix locally.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 39d06dd..bc309c5 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -154,7 +154,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