| Message ID | 4716007c23abeb0e42015786794539454aff487b.1520886814.git.dvhart@infradead.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Darren Hart |
| Headers | show |
On Mon, Mar 12, 2018 at 3:07 PM, Dominik Brodowski <linux@dominikbrodowski.net> wrote: > > I'm awfully sorry, but this patch doesn't solve the issue. > CONFIG_ACPI_WMI=y was/is set, but still enabling CONFIG_DELL_SMBIOS_WMI=y > causes a very-early crash of v4.16-rc5. In fact, so early that the normal > boot messages never show up on the screen... Hmm. My xps13 works fine, but it's the 9350 version so not the same machine. But it does sound like that commit 25d47027e10 ("platform/x86: dell-smbios: Link all dell-smbios-* modules together") should just be reverted. It has clearly caused a lot more pain than it fixed. Linus
On Mon, Mar 12, 2018 at 03:17:57PM -0700, Linus Torvalds wrote: > On Mon, Mar 12, 2018 at 3:07 PM, Dominik Brodowski > <linux@dominikbrodowski.net> wrote: > > > > I'm awfully sorry, but this patch doesn't solve the issue. > > CONFIG_ACPI_WMI=y was/is set, but still enabling CONFIG_DELL_SMBIOS_WMI=y > > causes a very-early crash of v4.16-rc5. In fact, so early that the normal > > boot messages never show up on the screen... > > Hmm. My xps13 works fine, but it's the 9350 version so not the same machine. > > But it does sound like that commit 25d47027e10 ("platform/x86: > dell-smbios: Link all dell-smbios-* modules together") should just be > reverted. It has clearly caused a lot more pain than it fixed. Unfortunately, yes. This will re-instate the race condition it "fixed". I'll work with Mario to fix this properly in 4.17, preferably in a way that we can apply to stable. Pending an "oops, nevermind, the patch works" from Dominik by tomorrow morning, I'll submit the pull request to revert dell-smbios changes back to and including 25d47027e10. Apologies for the noise on this one Linus, it got away from me.
On Mon, Mar 12, 2018 at 04:33:11PM -0700, Darren Hart wrote: > On Mon, Mar 12, 2018 at 03:17:57PM -0700, Linus Torvalds wrote: > > On Mon, Mar 12, 2018 at 3:07 PM, Dominik Brodowski > > <linux@dominikbrodowski.net> wrote: > > > > > > I'm awfully sorry, but this patch doesn't solve the issue. > > > CONFIG_ACPI_WMI=y was/is set, but still enabling CONFIG_DELL_SMBIOS_WMI=y > > > causes a very-early crash of v4.16-rc5. In fact, so early that the normal > > > boot messages never show up on the screen... > > > > Hmm. My xps13 works fine, but it's the 9350 version so not the same machine. > > > > But it does sound like that commit 25d47027e10 ("platform/x86: > > dell-smbios: Link all dell-smbios-* modules together") should just be > > reverted. It has clearly caused a lot more pain than it fixed. > > Unfortunately, yes. This will re-instate the race condition it "fixed". > I'll work with Mario to fix this properly in 4.17, preferably in a way > that we can apply to stable. Pending an "oops, nevermind, the patch > works" from Dominik by tomorrow morning, I'll submit the pull request to > revert dell-smbios changes back to and including 25d47027e10. > > Apologies for the noise on this one Linus, it got away from me. Hi Linus, OK, I think we've identified the ordering issues and I have a patch out pending testing from Dominik (hopefully tonight). I'd like to hold off one more day on reverting if you're OK with that. At RC5, we're certainly further into the RC cycle than I want to see these changes. So if you just want to call it now, I understand and I'll send you the revert pull request. If you can give me another day, I think we may finally have found the end of this loose string. Thanks,
On Tue, Mar 13, 2018 at 8:34 PM, Darren Hart <dvhart@infradead.org> wrote: > > At RC5, we're certainly further into the RC cycle than I want to see > these changes. So if you just want to call it now, I understand and I'll > send you the revert pull request. If you can give me another day, I > think we may finally have found the end of this loose string. Since it works for Dominik, and we understand what went wrong, I'm ok with the fix rather than the revert. But if somebody else ends up finding another problem later, we really need to revert it all basically immediately. No more time for games. Linus
On Wed, Mar 14, 2018 at 10:23:16AM -0700, Linus Torvalds wrote: > On Tue, Mar 13, 2018 at 8:34 PM, Darren Hart <dvhart@infradead.org> wrote: > > > > At RC5, we're certainly further into the RC cycle than I want to see > > these changes. So if you just want to call it now, I understand and I'll > > send you the revert pull request. If you can give me another day, I > > think we may finally have found the end of this loose string. > > Since it works for Dominik, and we understand what went wrong, I'm ok > with the fix rather than the revert. > > But if somebody else ends up finding another problem later, we really > need to revert it all basically immediately. No more time for games. On it. Branches are pushed and tagged, PR is written. Waiting for a couple final validation builds and will send the PR. Thanks,
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e55b008..1868aab 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -106,13 +106,14 @@ config ASUS_LAPTOP If you have an ACPI-compatible ASUS laptop, say Y or M here. # -# If the DELL_SMBIOS_SMM feature is enabled, the DELL_SMBIOS driver -# becomes dependent on the DCDBAS driver. The "depends" line prevents a -# configuration where DELL_SMBIOS=y while DCDBAS=m. +# The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those +# backends are selected. The "depends" line prevents a configuration +# where DELL_SMBIOS=y while either of those dependencies =m. # config DELL_SMBIOS tristate "Dell SMBIOS driver" depends on DCDBAS || DCDBAS=n + depends on ACPI_WMI || ACPI_WMI=n ---help--- This provides support for the Dell SMBIOS calling interface. If you have a Dell computer you should enable this option.
Similarly to DCDBAS for DELL_SMBIOS_SMM, if DELL_SMBIOS_WMI is enabled, DELL_SMBIOS becomes dependent on ACPI_WMI. Update the depends lines to prevent a configuration where DELL_SMBIOS=y and either backend dependency =m. Update the comment accordingly. Cc: Mario Limonciello <mario.limonciello@dell.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org> --- Since v1: Split depends line into two per Andy Shevchenko's feedback drivers/platform/x86/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)