Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5
Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit 25d47027e10 ("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
# CONFIG_DELL_WMI_AIO is not set
# CONFIG_DELL_WMI_LED is not set
# CONFIG_DELL_SMO8800 is not set
# CONFIG_DELL_RBTN is not set
# CONFIG_DELL_RBU is not set
For v4.16-rc5 to work, I need to manually disable DELL_SMBIOS_WMI:
-CONFIG_DELL_SMBIOS_WMI=y
+# CONFIG_DELL_SMBIOS_WMI is not set
Any ideas?
Thanks,
Dominik
Quoted 25 lines · Dominik Brodowski
Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not set
Quoted 1 line
Any ideas?
We're working on a dependency fix, but I think the problem you have here is likely to be ACPI_WMI=m instead of =y while you have DELL_SMBIOS=y
The fix won't allow that configuration. I'll include you in Cc of v2 of that fix which I'll send shortly.
Signature · 2 lines
Darren Hart VMware Open Source Technology Center
Quoted 34 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:54 AM
To: [email protected]; Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]
Subject: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not set
Quoted 2 lines
Any ideas?
Dominick,
Interesting. Can you please change CONFIG_DELL_SMBIOS to a module and see if that behavior persists? If it does, can you please blacklist it on the kernel command line and try to load it manually and share any backtrace?
Thanks,
Quoted 34 lines · On Mon, Mar 12, 2018 at 10:42:01PM +0000, [email protected] wrote:
Quoted 34 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:54 AM
To: [email protected]; Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]
Subject: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not set
Quoted 8 lines
Quoted 2 lines
Any ideas?
Dominick,
Interesting. Can you please change
CONFIG_DELL_SMBIOSto a module and see if that behavior persists? If it does, can you please blacklist it on the kernel command line and try to load it manually and share any backtrace?
Mario,
building and running it as a *module* works flawlessly. But that was actually expected after a 'grep "initcall"' in drivers/platform/x86:
As Darren pointed out, DELL_SMBIOS_WMI depends on ACPI_WMI, so probably ACPI_WMI needs to be initialized first. However, the all-in-one dell-smbios.o is run as subsys_initcall(), same as wmi.o (subsys_initcall_sync() there).
If both are built-ins, that means that dell-smbios.o is run first, and wmi.o second. Changing dell-smbios.o to run at the later fs_initcall() level instead lets me boot the kernel. HOWEVER:
1) Is there a reason why both the core and the dell-smbios-smm driver have to run already at subsys_initcall() time? They did so previous to your patch. Is it OK to defer these parts opf the all-in-one dell-smbios.o to fs_initcall(), or even to the default device_initcall()?
2) dell-smbios-wmi depends on (well, selects) DELL_WMI_DESCRIPTOR. The dell-smbios-wmi is running at the default device_initcall() time, but (AFAICS) probably later than the initialization of dell-smbios-wmi.o. May I presume that this poses no additional problem?
Thanks,
Dominik
Quoted 52 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 1:51 PM
To: Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Quoted 34 lines · On Mon, Mar 12, 2018 at 10:42:01PM +0000, [email protected] wrote:
Quoted 34 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:54 AM
To: [email protected]; Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]
Subject: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not setQuoted 8 lines
Quoted 2 lines
Any ideas?
Dominick,
Interesting. Can you please change
CONFIG_DELL_SMBIOSto a module and see if that behavior persists? If it does, can you please blacklist it on the kernel command line and try to load it manually and share any backtrace?
Quoted 4 lines
Mario,
building and running it as a *module* works flawlessly. But that was actually expected after a 'grep "initcall"' in
drivers/platform/x86:
Dominck,
Thanks for your checking and explanation of the situation.
Quoted 6 lines
As Darren pointed out,
DELL_SMBIOS_WMIdepends onACPI_WMI, so probablyACPI_WMIneeds to be initialized first. However, the all-in-one dell-smbios.o is run assubsys_initcall(), same as wmi.o (subsys_initcall_sync()there).
Quoted 8 lines
If both are built-ins, that means that dell-smbios.o is run first, and wmi.o second. Changing dell-smbios.o to run at the later
fs_initcall()level instead lets me boot the kernel. HOWEVER:1) Is there a reason why both the core and the dell-smbios-smm driver have to run already at
subsys_initcall()time? They did so previous to your patch. Is it OK to defer these parts opf the all-in-one dell-smbios.o tofs_initcall(), or even to the defaultdevice_initcall()?
As long as they're ready before dell-laptop's initialization which uses late_initcall that should be fine.
Am I correct to presume you're going to propose a patch you can test and confirm your hypothesis rather than Darren reverting my patch to bring them together?
Quoted 6 lines
2) dell-smbios-wmi depends on (well, selects)
DELL_WMI_DESCRIPTOR. The dell-smbios-wmi is running at the defaultdevice_initcall()time, but (AFAICS) probably later than the initialization of dell-smbios-wmi.o. May I presume that this poses no additional problem?
I "think" that should actually be fine. The driver will use deferred probing until it's ready meaning that dell-smbios-wmi should wait until dell-wmi-descriptor is done with it's probing routine.
Quoted 63 lines · Dominik Brodowski
Quoted 34 lines · On Mon, Mar 12, 2018 at 10:42:01PM +0000, [email protected] wrote:
Quoted 34 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:54 AM
To: [email protected]; Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]
Subject: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not setQuoted 8 lines
Quoted 2 lines
Any ideas?
Dominick,
Interesting. Can you please change
CONFIG_DELL_SMBIOSto a module and see if that behavior persists? If it does, can you please blacklist it on the kernel command line and try to load it manually and share any backtrace?Mario,
building and running it as a *module* works flawlessly. But that was actually expected after a 'grep "initcall"' in
drivers/platform/x86:As Darren pointed out,
DELL_SMBIOS_WMIdepends onACPI_WMI, so probablyACPI_WMIneeds to be initialized first. However, the all-in-one dell-smbios.o is run assubsys_initcall(), same as wmi.o (subsys_initcall_sync()there).If both are built-ins, that means that dell-smbios.o is run first, and wmi.o second. Changing dell-smbios.o to run at the later
fs_initcall()level instead lets me boot the kernel. HOWEVER:1) Is there a reason why both the core and the dell-smbios-smm driver have to run already at
subsys_initcall()time? They did so previous to your patch. Is it OK to defer these parts opf the all-in-one dell-smbios.o tofs_initcall(), or even to the defaultdevice_initcall()?
Quoted 4 lines
2) dell-smbios-wmi depends on (well, selects)
DELL_WMI_DESCRIPTOR. The dell-smbios-wmi is running at the defaultdevice_initcall()time, but (AFAICS) probably later than the initialization of dell-smbios-wmi.o. May I presume that this poses no additional problem?
Nice catch Dominik,
There is one other caveat, which you'll find documented in dell-laptop.c, namely that dell-laptop needs to init after dell-rbtn (I'm starting to appreciate the monolithic thinkpad-acpi driver).
We need things to init in this order (items on the same line have no dependency):
1. DCDBAS, ACPI_WMI
2. DELL_SMBIOS, DELL_RBTN
3. DELL_LAPTOP, DELL_WMI
Currently:subsys_initcall: ACPI_WMI, DELL_SMBIOSmodule_init: DCDBAS, DELL_WMIlate_initcall: DELL_LAPTOP
From a quick naive glance, it appears as though we might be able to address this as follows:
subsys_initcall: DCDBAS, ACPI_WMImodule_init: DELL_SMBIOS, DELL_RBTNlate_initcall: DELL_LAPTOP, DELL_WMI
e.g. Totally untested...
From 2dd1191593a46bf8fd1e5be8bbfb98b797e041f8 Mon Sep 17 00:00:00 2001
Message-Id: <2dd1191593a46bf8fd1e5be8bbfb98b797e041f8.1520922688.git.dvhart@infradead.org>
From: "Darren Hart (VMware)" <[email protected]>
Date: Mon, 12 Mar 2018 23:28:00 -0700
Subject: [PATCH] platform/x86: Fix dell driver init order
Update the initcall ordering to satisfy the following dependency ordering:
1. DCDBAS, ACPI_WMI
2. DELL_SMBIOS, DELL_RBTN
3. DELL_LAPTOP, DELL_WMI
By assigning them to the following initcall levels:
subsys_initcall: DCDBAS, ACPI_WMImodule_init: DELL_SMBIOS, DELL_RBTNlate_initcall: DELL_LAPTOP, DELL_WMI
--- drivers/firmware/dcdbas.c | 2 +- drivers/platform/x86/dell-smbios-base.c | 2 +- drivers/platform/x86/dell-wmi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/dcdbas.c +1 -1
@@ -639,7 +639,7 @@ static void __exit dcdbas_exit(void)platform_driver_unregister (&dcdbas_driver); } -module_init (dcdbas_init); +subsys_initcall_sync (dcdbas_init);module_exit (dcdbas_exit);MODULE_DESCRIPTION (DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")" );
drivers/platform/x86/dell-smbios-base.c +1 -1
@@ -637,7 +637,7 @@ static void __exit dell_smbios_exit(void)mutex_unlock (&smbios_mutex); } -subsys_initcall (dell_smbios_init); +module_init (dell_smbios_init);module_exit (dell_smbios_exit);MODULE_AUTHOR ("Matthew Garrett <[email protected]>" );
drivers/platform/x86/dell-wmi.c +1 -1
@@ -714,7 +714,7 @@ static int __init dell_wmi_init(void)return wmi_driver_register (&dell_wmi_driver); } -module_init (dell_wmi_init); +late_initcall (dell_wmi_init); static void __exit dell_wmi_exit(void) {
Signature · 6 lines
2.9.5 -- Darren Hart VMware Open Source Technology Center
Quoted 6 lines · On Tue, Mar 13, 2018 at 06:12:04AM +0000, [email protected] wrote:
As long as they're ready before dell-laptop's initialization which uses
late_initcallthat should be fine.Am I correct to presume you're going to propose a patch you can test and confirm your hypothesis rather than Darren reverting my patch to bring them together?
Thanks for the input; a draft patch (which works fine on my system) is attached below.
Quoted 16 lines · Darren Hart
There is one other caveat, which you'll find documented in
dell-laptop.c, namely that dell-laptop needs to init after dell-rbtn (I'm starting to appreciate the monolithic thinkpad-acpi driver).We need things to init in this order (items on the same line have no dependency):
1. DCDBAS,
ACPI_WMI
2.DELL_SMBIOS,DELL_RBTN
3.DELL_LAPTOP,DELL_WMICurrently:
subsys_initcall:ACPI_WMI,DELL_SMBIOSmodule_init: DCDBAS,DELL_WMIlate_initcall:DELL_LAPTOP
Quoted 6 lines
From a quick naive glance, it appears as though we might be able to address this as follows:
subsys_initcall: DCDBAS,ACPI_WMImodule_init:DELL_SMBIOS,DELL_RBTNlate_initcall:DELL_LAPTOP,DELL_WMI
Hmmm. I do not yet understand why you propose to
a) advance the DCDBAS initialization to subsys_initcall, as only DELL_LAPTOP (running as a late_initcall) requires it to be up and running, and
b) delay DELL_WMI to late_initcall, as it can safely be initialized as long as ACPI_WMI is ready.
What do I miss?
Attached patch *seems* to work fine on my system.
Thanks,
Dominik
----
From: Dominik Brodowski <[email protected]>
Date: Tue, 13 Mar 2018 07:27:41 +0100
Subject: [PATCH] platform/x86: dell-smbios: wait for WMI initialization
If DELL_SMBIOS_WMI is enabled, the combined dell-smbios driver needs to wait for ACPI_WMI to be initialized, which occurs at the subsys_initcall() level. As the dell-smbios driver only needs to be up and running by the time the dell-laptop module is initialized, which occurs at the late_initcall() level, it is sufficient to initialize the dell-smbios driver at the default device_initcall() level.
drivers/platform/x86/dell-smbios-base.c +1 -1
@@ -637,7 +637,7 @@ static void __exit dell_smbios_exit(void)mutex_unlock (&smbios_mutex); } -subsys_initcall (dell_smbios_init); +module_init (dell_smbios_init);module_exit (dell_smbios_exit);MODULE_AUTHOR ("Matthew Garrett <[email protected]>" );
Quoted 39 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:44 PM
To: Limonciello, Mario <[email protected]>; Darren Hart <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Quoted 6 lines · On Tue, Mar 13, 2018 at 06:12:04AM +0000, [email protected] wrote:
As long as they're ready before dell-laptop's initialization which uses
late_initcallthat should be fine.Am I correct to presume you're going to propose a patch you can test and confirm your hypothesis rather than Darren reverting my patch to bring them together?
Thanks for the input; a draft patch (which works fine on my system) is attached below.
Quoted 19 lines · Darren Hart
There is one other caveat, which you'll find documented in
dell-laptop.c, namely that dell-laptop needs to init after dell-rbtn (I'm starting to appreciate the monolithic thinkpad-acpi driver).We need things to init in this order (items on the same line have no dependency):
1. DCDBAS,
ACPI_WMI
2.DELL_SMBIOS,DELL_RBTN
3.DELL_LAPTOP,DELL_WMICurrently:
subsys_initcall:ACPI_WMI,DELL_SMBIOSmodule_init: DCDBAS,DELL_WMIlate_initcall:DELL_LAPTOPFrom a quick naive glance, it appears as though we might be able to address this as follows:
Quoted 8 lines
Quoted 3 lines
subsys_initcall: DCDBAS,ACPI_WMImodule_init:DELL_SMBIOS,DELL_RBTNlate_initcall:DELL_LAPTOP,DELL_WMIHmmm. I do not yet understand why you propose to
a) advance the DCDBAS initialization to
subsys_initcall, as onlyDELL_LAPTOP(running as alate_initcall) requires it to be up and running, and
Actually dell-smbios itself should require this too. The SMM backend will use it during initialization to determine if WSMT is enabled. If it's not operational yet then we may get invalid results.
So considering this I think Darren's proposal is good to move DCDBAS to earlier.
Quoted 3 lines
b) delay
DELL_WMItolate_initcall, as it can safely be initialized as long asACPI_WMIis ready.
Maybe Darren meant dell-wmi-descriptor not dell-wmi? Otherwise I would agree that part isn't needed.
Quoted 4 lines
What do I miss?
Attached patch *seems* to work fine on my system.
At least to me, I think it's better to see
Quoted 35 lines
Thanks,
Dominik----
From: Dominik Brodowski <[email protected]>
Date: Tue, 13 Mar 2018 07:27:41 +0100
Subject: [PATCH] platform/x86: dell-smbios: wait for WMI initializationIf
DELL_SMBIOS_WMIis enabled, the combined dell-smbios driver needs to wait forACPI_WMIto be initialized, which occurs at thesubsys_initcall()level. As the dell-smbios driver only needs to be up and running by the time the dell-laptop module is initialized, which occurs at thelate_initcall()level, it is sufficient to initialize the dell-smbios driver at the defaultdevice_initcall()level.Fixes 25d47027e100 ("platform/x86: dell-smbios: Link all dell-smbios-* modulestogether")
Signed-off-by Dominik Brodowski <[email protected]>drivers/platform/x86/dell- renamed from drivers/platform/x86/dell-smbios-base.c +0
-0
smbios-base.c
index5bcf8a18f785..2485c80a9fdd100644drivers/platform/x86/dell-smbios-base.c +1
-1@@ -637,7 +637,7 @@ static void __exit dell_smbios_exit(void)mutex_unlock (&smbios_mutex); } -subsys_initcall (dell_smbios_init); +module_init (dell_smbios_init);module_exit (dell_smbios_exit);MODULE_AUTHOR ("Matthew Garrett <[email protected]>" );
Quoted 43 lines · On Tue, Mar 13, 2018 at 07:07:26AM +0000, [email protected] wrote:
Quoted 43 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:44 PM
To: Limonciello, Mario <[email protected]>; Darren Hart <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Quoted 6 lines · On Tue, Mar 13, 2018 at 06:12:04AM +0000, [email protected] wrote:
As long as they're ready before dell-laptop's initialization which uses
late_initcallthat should be fine.Am I correct to presume you're going to propose a patch you can test and confirm your hypothesis rather than Darren reverting my patch to bring them together?
Thanks for the input; a draft patch (which works fine on my system) is attached below.
Quoted 22 lines · Darren Hart
There is one other caveat, which you'll find documented in
dell-laptop.c, namely that dell-laptop needs to init after dell-rbtn (I'm starting to appreciate the monolithic thinkpad-acpi driver).We need things to init in this order (items on the same line have no dependency):
1. DCDBAS,
ACPI_WMI
2.DELL_SMBIOS,DELL_RBTN
3.DELL_LAPTOP,DELL_WMICurrently:
subsys_initcall:ACPI_WMI,DELL_SMBIOSmodule_init: DCDBAS,DELL_WMIlate_initcall:DELL_LAPTOPFrom a quick naive glance, it appears as though we might be able to address this as follows:
subsys_initcall: DCDBAS,ACPI_WMImodule_init:DELL_SMBIOS,DELL_RBTNlate_initcall:DELL_LAPTOP,DELL_WMI
Quoted 9 lines
Quoted 4 lines
Hmmm. I do not yet understand why you propose to
a) advance the DCDBAS initialization to
subsys_initcall, as onlyDELL_LAPTOP(running as alate_initcall) requires it to be up and running, andActually dell-smbios itself should require this too. The SMM backend will use it during initialization to determine if WSMT is enabled. If it's not operational yet then we may get invalid results.
Exactly.
Quoted 8 lines
So considering this I think Darren's proposal is good to move DCDBAS to earlier.
Quoted 3 lines
b) delay
DELL_WMItolate_initcall, as it can safely be initialized as long asACPI_WMIis ready.Maybe Darren meant dell-wmi-descriptor not dell-wmi? Otherwise I would agree that part isn't needed.
Like DELL_LAPTOP, DELL_WMI depends on smbios being ready, so needs to init after DELL_SMBIOS as well.
Signature · 2 lines
Darren Hart VMware Open Source Technology Center
Quoted 70 lines
-----Original Message-----
From: Darren Hart [mailto:[email protected]]
Sent: Wednesday, March 14, 2018 5:43 AM
To: Limonciello, Mario <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]
Subject: Re: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Quoted 43 lines · On Tue, Mar 13, 2018 at 07:07:26AM +0000, [email protected] wrote:
Quoted 43 lines
-----Original Message-----
From: Dominik Brodowski [mailto:[email protected]]
Sent: Tuesday, March 13, 2018 2:44 PM
To: Limonciello, Mario <[email protected]>; Darren Hart <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: Dell Inc. XPS 13 9343/0TM99H fails to boot v4.16-rc5Quoted 6 lines · On Tue, Mar 13, 2018 at 06:12:04AM +0000, [email protected] wrote:
As long as they're ready before dell-laptop's initialization which uses
late_initcallthat should be fine.Am I correct to presume you're going to propose a patch you can test and confirm your hypothesis rather than Darren reverting my patch to bring them together?
Thanks for the input; a draft patch (which works fine on my system) is attached below.
Quoted 22 lines · Darren Hart
There is one other caveat, which you'll find documented in
dell-laptop.c, namely that dell-laptop needs to init after dell-rbtn (I'm starting to appreciate the monolithic thinkpad-acpi driver).We need things to init in this order (items on the same line have no dependency):
1. DCDBAS,
ACPI_WMI
2.DELL_SMBIOS,DELL_RBTN
3.DELL_LAPTOP,DELL_WMICurrently:
subsys_initcall:ACPI_WMI,DELL_SMBIOSmodule_init: DCDBAS,DELL_WMIlate_initcall:DELL_LAPTOPFrom a quick naive glance, it appears as though we might be able to address this as follows:
subsys_initcall: DCDBAS,ACPI_WMImodule_init:DELL_SMBIOS,DELL_RBTNlate_initcall:DELL_LAPTOP,DELL_WMIQuoted 9 lines
Quoted 4 lines
Hmmm. I do not yet understand why you propose to
a) advance the DCDBAS initialization to
subsys_initcall, as onlyDELL_LAPTOP(running as alate_initcall) requires it to be up and running, andActually dell-smbios itself should require this too. The SMM backend will use it during initialization to determine if WSMT is enabled. If it's not operational yet then we may get invalid results.
Exactly.
Quoted 6 lines
So considering this I think Darren's proposal is good to move DCDBAS to earlier.
Quoted 3 lines
b) delay
DELL_WMItolate_initcall, as it can safely be initialized as long asACPI_WMIis ready.
Quoted 7 lines
Quoted 2 lines
Maybe Darren meant dell-wmi-descriptor not dell-wmi? Otherwise I would agree that part isn't needed.
Like
DELL_LAPTOP,DELL_WMIdepends on smbios being ready, so needs to init afterDELL_SMBIOSas well.--
OK thanks for explaining.
Dominik,
Can you please verify if Darren's patch works for you too?
Darren,
If that patch works for Dominik, I'm fine with that for 4.16 if you keep this series, otherwise we can retry for 4.17 and squash the various patches together.
Thanks,
PATCH v2 1/1 platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI
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.
---
Since v1: Split depends line into two per Andy Shevchenko's feedback
drivers/platform/x86/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/platform/x86/Kconfig +4 -3
@@ -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.
Signature · 6 lines
2.9.5 -- Darren Hart VMware Open Source Technology Center
Quoted 33 lines · Darren Hart
Quoted 25 lines · Dominik Brodowski
Mario,
unfortunately, my Dell Inc. XPS 13 9343/0TM99H, BIOS A11 12/08/2016 fails to boot v4.16-rc5. More exactly, I could bisect it down to commit
25d47027e10("platform/x86: dell-smbios: Link all dell-smbios-* modules together"). Usually, I have enabled
CONFIG_SENSORS_DELL_SMM=yCONFIG_DELL_SMBIOS=yCONFIG_DELL_SMBIOS_WMI=yCONFIG_DELL_SMBIOS_SMM=yCONFIG_DELL_LAPTOP=yCONFIG_DELL_WMI=yCONFIG_DELL_WMI_DESCRIPTOR=y
#CONFIG_DELL_WMI_AIOis not set
#CONFIG_DELL_WMI_LEDis not set
#CONFIG_DELL_SMO8800is not set
#CONFIG_DELL_RBTNis not set
#CONFIG_DELL_RBUis not setFor v4.16-rc5 to work, I need to manually disable
DELL_SMBIOS_WMI:(quoted diff) +1
-1-CONFIG_DELL_SMBIOS_WMI=y +# CONFIG_DELL_SMBIOS_WMI is not setQuoted 1 line
Any ideas?
We're working on a dependency fix, but I think the problem you have here is likely to be ACPI_WMI=m instead of =y while you have DELL_SMBIOS=y
The fix won't allow that configuration. I'll include you in Cc of v2 of that fix which I'll send shortly.
Quoted 4 lines · Darren Hart
Similarly to DCDBAS for
DELL_SMBIOS_SMM, ifDELL_SMBIOS_WMIis enabled,DELL_SMBIOSbecomes dependent onACPI_WMI. Update the depends lines to prevent a configuration where DELL_SMBIOS=y and either backend dependency =m. Update the comment accordingly.
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...
Thanks,
Dominik
Quoted 5 lines · Dominik Brodowski
I'm awfully sorry, but this patch doesn't solve the issue.
CONFIG_ACPI_WMI=ywas/is set, but still enablingCONFIG_DELL_SMBIOS_WMI=ycauses 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
Quoted 8 lines · Linus Torvalds
Quoted 5 lines · Dominik Brodowski
I'm awfully sorry, but this patch doesn't solve the issue.
CONFIG_ACPI_WMI=ywas/is set, but still enablingCONFIG_DELL_SMBIOS_WMI=ycauses a very-early crash of v4.16-rc5. In fact, so early that the normal boot messages never show up on the screen...
Quoted 5 lines
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.
Signature · 2 lines
Darren Hart VMware Open Source Technology Center
Quoted 15 lines · Darren Hart
Quoted 8 lines · Linus Torvalds
Quoted 5 lines · Dominik Brodowski
I'm awfully sorry, but this patch doesn't solve the issue.
CONFIG_ACPI_WMI=ywas/is set, but still enablingCONFIG_DELL_SMBIOS_WMI=ycauses a very-early crash of v4.16-rc5. In fact, so early that the normal boot messages never show up on the screen...Quoted 5 lines
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.
Quoted 7 lines
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,
Signature · 2 lines
Darren Hart VMware Open Source Technology Center
Quoted 3 lines · On Wed, Mar 14, 2018 at 01:28:54AM +0000, [email protected] wrote:
Dominik,
Can you please verify if Darren's patch works for you too?
Yes, it does.
Thanks,
Dominik
Quoted 5 lines · Darren Hart
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
Quoted 7 lines · Linus Torvalds
Quoted 5 lines · Darren Hart
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.
Quoted 5 lines
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,
Signature · 2 lines
Darren Hart VMware Open Source Technology Center