i2c: i801: add I2C_MUX dependency
Subsystems (2)
PATCH 1/1 i2c: i801: add I2C_MUX dependency
From: Arnd Bergmann <[email protected]>
When I2C_MUX is a loadable module but I2C_I801 is built-in, the newly added notifier function causes a link error:
x86_64-linux-ld: drivers/i2c/busses/i2c-i801.o: in function `i801_notifier_call':
i2c-i801.c:(.text+0x1f5): undefined reference to `i2c_root_adapter'
This code is only built if I2C_MUX_GPIO is also enabled, so add a conditional dependency that allows building the driver as before if the GPIO part is disabled, but otherwise require the linker dependency at Kconfig level.
With the added dependency, the driver cannot be selected by a builtin ITCO_WDT driver when I2C_MUX_GPIO is a loadable module, so remove the 'select' statement in that driver as well. This was apparently never needed at compile-time, and the watchdog driver just needs either the LPC or the I2C drivers, but never both.
Configurations that rely on the implied 'select' from the watchdog driver now need to enable all three.
--- drivers/i2c/busses/Kconfig | 1 + drivers/watchdog/Kconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/i2c/busses/Kconfig +1 -0
@@ -108,6 +108,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" depends on PCI + depends on I2C_MUX || I2C_MUX_GPIO=n select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUS
drivers/watchdog/Kconfig +0 -2
@@ -1301,8 +1301,6 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT - select LPC_ICH if !EXPERT - select I2C_I801 if !EXPERT && I2C help Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O Controller
Signature · 1 line
2.39.2
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When
I2C_MUXis a loadable module butI2C_I801is built-in, the newly added notifier function causes a link error:x86_64-linux-ld:
drivers/i2c/busses/i2c-i801.o: in function `i801_notifier_call':
i2c-i801.c:(.text+0x1f5): undefined reference to `i2c_root_adapter'This code is only built if
I2C_MUX_GPIOis also enabled, so add a conditional dependency that allows building the driver as before if the GPIO part is disabled, but otherwise require the linker dependency atKconfiglevel.
Quoted 9 lines
With the added dependency, the driver cannot be selected by a builtin
ITCO_WDTdriver whenI2C_MUX_GPIOis a loadable module, so remove the 'select' statement in that driver as well. This was apparently never needed at compile-time, and the watchdog driver just needs either the LPC or the I2C drivers, but never both.Configurations that rely on the implied 'select' from the watchdog driver now need to enable all three.
Question is whether we really want that I2C_MUX restricts the choice for I2C_I801. Alternatively we can skip building the mux part in the problem case. The mux part can be used on very few old Asus systems with > 8 memory slots only. Proposal I sent:
https://lore.kernel.org/all/4dhfyaefnw2rtx5q7aaum6pfwha5o3vs65iqcrj2ghps34ubtw@b3bw3gggudjs/T/
Note also the CI bot tags, as the problem was reported by a CI bot before.
Quoted 32 lines
Fixes 71b494e043d2 ("i2c: i801: Call i2c_register_spd for muxed child segments")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/i2c/busses/Kconfig | 1 + drivers/watchdog/Kconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)drivers/i2c/busses/Kconfig +1
-0@@ -108,6 +108,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" depends on PCI + depends on I2C_MUX || I2C_MUX_GPIO=n select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUSdrivers/watchdog/Kconfig +0
-2@@ -1301,8 +1301,6 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT - select LPC_ICH if !EXPERT - select I2C_I801 if !EXPERT && I2C help Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O Controller
Quoted 11 lines · Heiner Kallweit
On 05.04.2024 16:27, Arnd Bergmann wrote:
Question is whether we really want that
I2C_MUXrestricts the choice forI2C_I801. Alternatively we can skip building the mux part in the problem case.
The mux part can be used on very few old Asus systems with > 8 memory slots only.
Proposal I sent:
https://lore.kernel.org/all/4dhfyaefnw2rtx5q7aaum6pfwha5o3vs65iqcrj2ghps34ubtw@b3bw3gggudjs/T/Note also the CI bot tags, as the problem was reported by a CI bot before.
That seems fine to me as well, and it avoids having to mess with the watchdog driver. We may want to change that bit anyway, but then it can be done independently.
Arnd
Andi Shyti
maintainerHi Arnd,
Quoted 19 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When
I2C_MUXis a loadable module butI2C_I801is built-in, the newly added notifier function causes a link error:x86_64-linux-ld:
drivers/i2c/busses/i2c-i801.o: in function `i801_notifier_call':
i2c-i801.c:(.text+0x1f5): undefined reference to `i2c_root_adapter'This code is only built if
I2C_MUX_GPIOis also enabled, so add a conditional dependency that allows building the driver as before if the GPIO part is disabled, but otherwise require the linker dependency atKconfiglevel.With the added dependency, the driver cannot be selected by a builtin
ITCO_WDTdriver whenI2C_MUX_GPIOis a loadable module, so remove the 'select' statement in that driver as well. This was apparently never needed at compile-time, and the watchdog driver just needs either the LPC or the I2C drivers, but never both.
Quoted 5 lines
Configurations that rely on the implied 'select' from the watchdog driver now need to enable all three.
Fixes 71b494e043d2 ("i2c: i801: Call i2c_register_spd for muxed child segments")Signed-off-by Arnd Bergmann <[email protected]>
thanks for the proposed fix, but Heiner has already submitted a fix for this issue. I'm going to mark this patch as superseeded, if that's OK with you.
Thanks,
Andi
Guenter Roeck
maintainerQuoted 46 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When
I2C_MUXis a loadable module butI2C_I801is built-in, the newly added notifier function causes a link error:x86_64-linux-ld:
drivers/i2c/busses/i2c-i801.o: in function `i801_notifier_call':
i2c-i801.c:(.text+0x1f5): undefined reference to `i2c_root_adapter'This code is only built if
I2C_MUX_GPIOis also enabled, so add a conditional dependency that allows building the driver as before if the GPIO part is disabled, but otherwise require the linker dependency atKconfiglevel.With the added dependency, the driver cannot be selected by a builtin
ITCO_WDTdriver whenI2C_MUX_GPIOis a loadable module, so remove the 'select' statement in that driver as well. This was apparently never needed at compile-time, and the watchdog driver just needs either the LPC or the I2C drivers, but never both.Configurations that rely on the implied 'select' from the watchdog driver now need to enable all three.
Fixes 71b494e043d2 ("i2c: i801: Call i2c_register_spd for muxed child segments")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/i2c/busses/Kconfig | 1 + drivers/watchdog/Kconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)drivers/i2c/busses/Kconfig +1
-0@@ -108,6 +108,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" depends on PCI + depends on I2C_MUX || I2C_MUX_GPIO=n select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUSdrivers/watchdog/Kconfig +0
-0
drivers/watchdog/Kconfig config ITCO_WDT · line 1305
Quoted 5 lines
drivers/watchdog/Kconfig +0
-2@@ -1301,8 +1301,6 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT - select LPC_ICH if !EXPERT - select I2C_I801 if !EXPERT && I2C
Sorry, I don't understand why LPC_ICH and I2C_I801 are neither a dependency nor need to be selected. What if both LPC_ICH=n and I2C_I801=n, or if one is selected but the other is needed to connect to the watchdog ?
Guenter
Quoted 6 lines
drivers/watchdog/Kconfig +0
-0help Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O ControllerSignature · 1 line
2.39.2
Quoted 20 lines · Guenter Roeck
Quoted 19 lines · Arnd Bergmann
drivers/i2c/busses/Kconfig +1
-0@@ -108,6 +108,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" depends on PCI + depends on I2C_MUX || I2C_MUX_GPIO=n select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUSdrivers/watchdog/Kconfig +0
-0@@ -1301,8 +1301,6 @@ config ITCO_WDT select WATCHDOG_CORE
Quoted 8 lines
drivers/watchdog/Kconfig config ITCO_WDT · line 1305
Quoted 4 lines
drivers/watchdog/Kconfig +0
-2depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT - select LPC_ICH if !EXPERT - select I2C_I801 if !EXPERT && I2CSorry, I don't understand why
LPC_ICHandI2C_I801are neither a dependency nor need to be selected. What if both LPC_ICH=n and I2C_I801=n, or if one is selected but the other is needed to connect to the watchdog ?
The Kconfig dependencies are only required if there is a compile-time dependencies. In this case, both LPC_ICH and I2C_I801 create a platform device that is consumed by ITCO_WDT, but it could in theory work with any other such driver providing the device.
It would be fine to make this explicit by adding 'depends on LPC_ICH || I2C_I801' to enforce that the watchdog driver can only be selected on if at least one of these is present, but we have a lot of examples where we don't spell out this type of dependency.
The two 'select' statements in comparison a really bad idea because a driver should never need to force-enable a user visible symbol in another subsystem, and because no single machine would actually require both the i810 and the ich driver.
Arnd
Guenter Roeck
maintainerQuoted 35 lines · Arnd Bergmann
Quoted 20 lines · Guenter Roeck
Quoted 19 lines · Arnd Bergmann
drivers/i2c/busses/Kconfig +1
-0@@ -108,6 +108,7 @@ config I2C_HIX5HD2 config I2C_I801 tristate "Intel 82801 (ICH/PCH)" depends on PCI + depends on I2C_MUX || I2C_MUX_GPIO=n select P2SB if X86 select CHECK_SIGNATURE if X86 && DMI select I2C_SMBUSdrivers/watchdog/Kconfig +0
-0@@ -1301,8 +1301,6 @@ config ITCO_WDT select WATCHDOG_COREQuoted 8 lines
drivers/watchdog/Kconfig config ITCO_WDT · line 1305
Quoted 4 lines
drivers/watchdog/Kconfig +0
-2depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT - select LPC_ICH if !EXPERT - select I2C_I801 if !EXPERT && I2CSorry, I don't understand why
LPC_ICHandI2C_I801are neither a dependency nor need to be selected. What if both LPC_ICH=n and I2C_I801=n, or if one is selected but the other is needed to connect to the watchdog ?The
Kconfigdependencies are only required if there is a compile-time dependencies. In this case, bothLPC_ICHandI2C_I801create a platform device that is consumed byITCO_WDT, but it could in theory work with any other such driver providing the device.
Quoted 6 lines
It would be fine to make this explicit by adding 'depends on
LPC_ICH||I2C_I801' to enforce that the watchdog driver can only be selected on if at least one of these is present, but we have a lot of examples where we don't spell out this type of dependency.
Yes, I know, there are lots of inconsistencies in the kernel and its configuration. That should not be an excuse to making it worse.
Guenter