ethernet/intel: fix PTP_1588_CLOCK dependencies
Subsystems (3)
PATCH 1/1 ethernet/intel: fix PTP_1588_CLOCK dependencies
From: Arnd Bergmann <[email protected]>
The 'imply' keyword does not do what most people think it does, it only politely asks Kconfig to turn on another symbol, but does not prevent it from being disabled manually or built as a loadable module when the user is built-in. In the ICE driver, the latter now causes a link failure:
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_eth_ioctl':
ice_main.c:(.text+0x13b0): undefined reference to `ice_ptp_get_ts_config'
ice_main.c:(.text+0x13b0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_get_ts_config'
aarch64-linux-ld: ice_main.c:(.text+0x13bc): undefined reference to ice_ptp_set_ts_config' ice_main.c:(.text+0x13bc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol ice_ptp_set_ts_config'
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_prepare_for_reset':
ice_main.c:(.text+0x31fc): undefined reference to `ice_ptp_release'
ice_main.c:(.text+0x31fc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `ice_ptp_release'
aarch64-linux-ld: drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_rebuild':
For the other Intel network drivers, there is no link error when the drivers are built-in and PTP is a loadable module, because linux/ptp_clock_kernel.h contains an IS_REACHABLE() check, but this just changes the compile-time failure to a runtime failure, which is arguably worse.
Change all the Intel drivers to use the 'depends on PTP_1588_CLOCK || !PTP_1588_CLOCK' trick to prevent the broken configuration, as we already do for several other drivers. To avoid circular dependencies, this also requires changing the IGB driver back to using the normal 'depends on I2C' instead of 'select I2C'.
--- drivers/net/ethernet/intel/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/Kconfig +6 -6
@@ -58,8 +58,8 @@ config E1000 config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" depends on PCI && (!SPARC32 || BROKEN) + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select CRC32 - imply PTP_1588_CLOCK help This driver supports the PCI-Express Intel(R) PRO/1000 gigabit ethernet family of adapters. For PCI or PCI-X e1000 adapters,
@@ -87,7 +87,7 @@ config E1000E_HWTS config IGB tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" depends on PCI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select I2C select I2C_ALGOBIT help
@@ -159,9 +159,9 @@ config IXGB config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select MDIO select PHYLIB - imply PTP_1588_CLOCK help This driver supports Intel(R) 10GbE PCI Express family of adapters. For more information on how to identify your adapter, go
@@ -239,7 +239,7 @@ config IXGBEVF_IPSEC config I40E tristate "Intel(R) Ethernet Controller XL710 Family support" - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK depends on PCI select AUXILIARY_BUS help
@@ -295,11 +295,11 @@ config ICE tristate "Intel(R) Ethernet Connection E800 Series Support" default n depends on PCI_MSI + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select AUXILIARY_BUS select DIMLIB select NET_DEVLINK select PLDMFW - imply PTP_1588_CLOCK help This driver supports Intel(R) Ethernet Connection E800 Series of devices. For more information on how to identify your adapter, go
@@ -317,7 +317,7 @@ config FM10K tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support" default n depends on PCI_MSI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK help This driver supports Intel(R) FM10000 Ethernet Switch Host Interface. For more information on how to identify your adapter,
Signature · 1 line
2.29.2
kernel test robot
build botI love your patch! Yet something to improve:
Hi Arnd,
I love your patch! Yet something to improve:
[auto build test ERROR on tnguy-next-queue/dev-queue]
[also build test ERROR on v5.14-rc3 next-20210723]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Arnd-Bergmann/ethernet-intel-fix-PTP_1588_CLOCK-dependencies/20210726-164755 base: https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git dev-queue config: um-x86_64_defconfig (attached as .config) compiler: gcc-10 (Ubuntu 10.3.0-1ubuntu1~20.04) 10.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/400b6b5bda753bdd933ea7f6b55be00cc4a692ed git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Arnd-Bergmann/ethernet-intel-fix-PTP_1588_CLOCK-dependencies/20210726-164755 git checkout 400b6b5bda753bdd933ea7f6b55be00cc4a692ed # save the attached .config to linux build tree make W=1 ARCH=um SUBARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/i2c/Kconfig:8:error: recursive dependency detected!
drivers/i2c/Kconfig:8: symbol I2C is selected by IGB drivers/net/ethernet/intel/Kconfig:87: symbol IGB depends on PTP_1588_CLOCK drivers/ptp/Kconfig:8: symbol PTP_1588_CLOCK is implied by MLX4_EN drivers/net/ethernet/mellanox/mlx4/Kconfig:6: symbol MLX4_EN depends on NET_VENDOR_MELLANOX drivers/net/ethernet/mellanox/Kconfig:6: symbol NET_VENDOR_MELLANOX depends on I2C For a resolution refer to Documentation/kbuild/kconfig-language.rst subsection "Kconfig recursive dependency limitations"
vim +8 drivers/i2c/Kconfig
da3c6647ee0871 Lan Tianyu 2014-05-20 7 da3c6647ee0871 Lan Tianyu 2014-05-20 @8 config I2C ^1da177e4c3f41 Linus Torvalds 2005-04-16 9 tristate "I2C support" 194684e596af4b Mika Kuoppala 2009-12-06 10 select RT_MUTEXES 4d5538f5882a6b Benjamin Tissoires 2016-10-13 11 select IRQ_DOMAIN a7f7f6248d9740 Masahiro Yamada 2020-06-14 12 help 622e040d577dc8 Michael Witten 2011-07-08 13 I2C (pronounce: I-squared-C) is a slow serial bus protocol used in ^1da177e4c3f41 Linus Torvalds 2005-04-16 14 many micro controller applications and developed by Philips. SMBus, ^1da177e4c3f41 Linus Torvalds 2005-04-16 15 or System Management Bus is a subset of the I2C protocol. More ^1da177e4c3f41 Linus Torvalds 2005-04-16 16 information is contained in the directory <file:Documentation/i2c/>, ^1da177e4c3f41 Linus Torvalds 2005-04-16 17 especially in the file called "summary" there. ^1da177e4c3f41 Linus Torvalds 2005-04-16 18 ^1da177e4c3f41 Linus Torvalds 2005-04-16 19 Both I2C and SMBus are supported here. You will need this for ^1da177e4c3f41 Linus Torvalds 2005-04-16 20 hardware sensors support, and also for Video For Linux support. ^1da177e4c3f41 Linus Torvalds 2005-04-16 21 ^1da177e4c3f41 Linus Torvalds 2005-04-16 22 If you want I2C support, you should say Y here and also to the ^1da177e4c3f41 Linus Torvalds 2005-04-16 23 specific driver for your bus adapter(s) below. ^1da177e4c3f41 Linus Torvalds 2005-04-16 24 ^1da177e4c3f41 Linus Torvalds 2005-04-16 25 This I2C support can also be built as a module. If so, the module ^1da177e4c3f41 Linus Torvalds 2005-04-16 26 will be called i2c-core. ^1da177e4c3f41 Linus Torvalds 2005-04-16 27
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 8 lines · kernel test robot
Quoted 1 line
Quoted 1 line
drivers/i2c/Kconfig:8:error: recursive dependency detected!
drivers/i2c/Kconfig:8: symbol I2C is selected by IGBdrivers/net/ethernet/intel/Kconfig:87: symbol IGB depends onPTP_1588_CLOCKdrivers/ptp/Kconfig:8: symbolPTP_1588_CLOCKis implied byMLX4_ENdrivers/net/ethernet/mellanox/mlx4/Kconfig:6: symbolMLX4_ENdepends onNET_VENDOR_MELLANOXdrivers/net/ethernet/mellanox/Kconfig:6: symbolNET_VENDOR_MELLANOXdepends on I2C For a resolution refer toDocumentation/kbuild/kconfig-language.rstsubsection "Kconfigrecursive dependency limitations"
Sorry about this, the patch I was testing with has this additional hunk
@@ -88,7 +88,7 @@ config IGB
tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" depends on PCI
depends on PTP_1588_CLOCK || !PTP_1588_CLOCK
- select I2C
+ depends on I2C
select I2C_ALGOBIT
help
This driver supports Intel(R) 82575/82576 gigabit ethernet family of
that I even describe in the changelog but forgot to include in the patch I sent.
Arnd
Keller, Jacob E
Acked-byQuoted 23 lines · Arnd Bergmann
Quoted 8 lines · kernel test robot
Quoted 1 line
Quoted 1 line
drivers/i2c/Kconfig:8:error: recursive dependency detected!
drivers/i2c/Kconfig:8: symbol I2C is selected by IGBdrivers/net/ethernet/intel/Kconfig:87: symbol IGB depends onPTP_1588_CLOCKdrivers/ptp/Kconfig:8: symbolPTP_1588_CLOCKis implied byMLX4_ENdrivers/net/ethernet/mellanox/mlx4/Kconfig:6: symbolMLX4_ENdepends onNET_VENDOR_MELLANOXdrivers/net/ethernet/mellanox/Kconfig:6: symbolNET_VENDOR_MELLANOXdepends on I2C For a resolution refer toDocumentation/kbuild/kconfig-language.rstsubsection "Kconfigrecursive dependency limitations"Sorry about this, the patch I was testing with has this additional hunk
drivers/net/ethernet/intel/Kconfig +1
-1@@ -88,7 +88,7 @@ config IGB tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" depends on PCI depends on PTP_1588_CLOCK || !PTP_1588_CLOCK - select I2C + depends on I2C select I2C_ALGOBIT help This driver supports Intel(R) 82575/82576 gigabit ethernet family of
Quoted 4 lines
that I even describe in the changelog but forgot to include in the patch I sent.
Arnd
With this hunk applied, everything looks good to me. Thanks for the fix!
It would be nice if this sort of dependency had a keyword or some other slightly more intuitive way of handling it.
We could make run-time IS_REACHABLE checks so that the functions which call into enable PTP support were disabled at run time in that case, I suppose as an alternative fix to this....
kernel test robot
build botI love your patch! Yet something to improve:
Hi Arnd,
I love your patch! Yet something to improve:
[auto build test ERROR on tnguy-next-queue/dev-queue]
[also build test ERROR on v5.14-rc3 next-20210723]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Arnd-Bergmann/ethernet-intel-fix-PTP_1588_CLOCK-dependencies/20210726-164755 base: https://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue.git dev-queue config: mips-randconfig-r002-20210726 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project c63dbd850182797bc4b76124d08e1c320ab2365d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install mips cross compiling tool for clang build
# apt-get install binutils-mips-linux-gnu
# https://github.com/0day-ci/linux/commit/400b6b5bda753bdd933ea7f6b55be00cc4a692ed
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Arnd-Bergmann/ethernet-intel-fix-PTP_1588_CLOCK-dependencies/20210726-164755 git checkout 400b6b5bda753bdd933ea7f6b55be00cc4a692ed
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=mips
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/i2c/Kconfig:8:error: recursive dependency detected!
drivers/i2c/Kconfig:8: symbol I2C is selected by IGB drivers/net/ethernet/intel/Kconfig:87: symbol IGB depends on PTP_1588_CLOCK drivers/ptp/Kconfig:8: symbol PTP_1588_CLOCK is implied by MLX4_EN drivers/net/ethernet/mellanox/mlx4/Kconfig:6: symbol MLX4_EN depends on NET_VENDOR_MELLANOX drivers/net/ethernet/mellanox/Kconfig:6: symbol NET_VENDOR_MELLANOX depends on I2C For a resolution refer to Documentation/kbuild/kconfig-language.rst subsection "Kconfig recursive dependency limitations"
vim +8 drivers/i2c/Kconfig
da3c6647ee0871 Lan Tianyu 2014-05-20 7 da3c6647ee0871 Lan Tianyu 2014-05-20 @8 config I2C ^1da177e4c3f41 Linus Torvalds 2005-04-16 9 tristate "I2C support" 194684e596af4b Mika Kuoppala 2009-12-06 10 select RT_MUTEXES 4d5538f5882a6b Benjamin Tissoires 2016-10-13 11 select IRQ_DOMAIN a7f7f6248d9740 Masahiro Yamada 2020-06-14 12 help 622e040d577dc8 Michael Witten 2011-07-08 13 I2C (pronounce: I-squared-C) is a slow serial bus protocol used in ^1da177e4c3f41 Linus Torvalds 2005-04-16 14 many micro controller applications and developed by Philips. SMBus, ^1da177e4c3f41 Linus Torvalds 2005-04-16 15 or System Management Bus is a subset of the I2C protocol. More ^1da177e4c3f41 Linus Torvalds 2005-04-16 16 information is contained in the directory <file:Documentation/i2c/>, ^1da177e4c3f41 Linus Torvalds 2005-04-16 17 especially in the file called "summary" there. ^1da177e4c3f41 Linus Torvalds 2005-04-16 18 ^1da177e4c3f41 Linus Torvalds 2005-04-16 19 Both I2C and SMBus are supported here. You will need this for ^1da177e4c3f41 Linus Torvalds 2005-04-16 20 hardware sensors support, and also for Video For Linux support. ^1da177e4c3f41 Linus Torvalds 2005-04-16 21 ^1da177e4c3f41 Linus Torvalds 2005-04-16 22 If you want I2C support, you should say Y here and also to the ^1da177e4c3f41 Linus Torvalds 2005-04-16 23 specific driver for your bus adapter(s) below. ^1da177e4c3f41 Linus Torvalds 2005-04-16 24 ^1da177e4c3f41 Linus Torvalds 2005-04-16 25 This I2C support can also be built as a module. If so, the module ^1da177e4c3f41 Linus Torvalds 2005-04-16 26 will be called i2c-core. ^1da177e4c3f41 Linus Torvalds 2005-04-16 27
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Quoted 44 lines
-----Original Message-----
From: Arnd Bergmann <[email protected]>
Sent: Monday, July 26, 2021 1:45 AM
To: Brandeburg, Jesse <[email protected]>; Nguyen, Anthony L <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Keller, Jacob E <[email protected]>
Cc: Arnd Bergmann <[email protected]>; Kurt Kanzenbach <[email protected]>; Saleem, Shiraz <[email protected]>; Ertman, David M <[email protected]>; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org; linux-kernel at vger.kernel.org
Subject: [PATCH] ethernet/intel: fixPTP_1588_CLOCKdependenciesFrom: Arnd Bergmann <[email protected]>
The 'imply' keyword does not do what most people think it does, it only politely asks
Kconfigto turn on another symbol, but does not prevent it from being disabled manually or built as a loadable module when the user is built-in. In the ICE driver, the latter now causes a link failure:aarch64-linux-ld:
drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_eth_ioctl':
ice_main.c:(.text+0x13b0): undefined reference toice_ptp_get_ts_config' ice_main.c:(.text+0x13b0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbolice_ptp_get_ts_config'
aarch64-linux-ld: ice_main.c:(.text+0x13bc): undefined reference to `ice_ptp_set_ts_config'
ice_main.c:(.text+0x13bc): relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `ice_ptp_set_ts_config'
aarch64-linux-ld:drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_prepare_for_reset':
ice_main.c:(.text+0x31fc): undefined reference toice_ptp_release' ice_main.c:(.text+0x31fc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbolice_ptp_release'
aarch64-linux-ld:drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_rebuild':For the other Intel network drivers, there is no link error when the drivers are built-in and PTP is a loadable module, because
linux/ptp_clock_kernel.hcontains anIS_REACHABLE()check, but this just changes the compile-time failure to a runtime failure, which is arguably worse.
Quoted 8 lines
Change all the Intel drivers to use the 'depends on
PTP_1588_CLOCK|| !PTP_1588_CLOCK' trick to prevent the broken configuration, as we already do for several other drivers. To avoid circular dependencies, this also requires changing the IGB driver back to using the normal 'depends on I2C' instead of 'select I2C'.Fixes 06c16d89d2cb ("ice: register 1588 PTP clock device object for E810 devices")Signed-off-by Arnd Bergmann <[email protected]>
Thanks for fixing this!
It feels like Kconfig should have a simpler way to write this, and/or we should update the doc, since I would expect this to be a common issue with optional dependencies
Obviously "depends" handles this right but it forces a dependency in all cases, instead of being optional. select is used to ensure that some bit is turned on if you turn on that item, and imply is supposed to be that but optional...
Quoted 20 lines
--- drivers/net/ethernet/intel/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/net/ethernet/intel/Kconfig +1
-1@@ -58,8 +58,8 @@ config E1000 config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" depends on PCI && (!SPARC32 || BROKEN) + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select CRC32 - imply PTP_1588_CLOCK help This driver supports the PCI-Express Intel(R) PRO/1000 gigabit ethernet family of adapters. For PCI or PCI-X e1000 adapters,
drivers/net/ethernet/intel/Kconfig config E1000E_HWTS · line 91
Quoted 6 lines
drivers/net/ethernet/intel/Kconfig +1
-1@@ -87,7 +87,7 @@ config E1000E_HWTS config IGB tristate "Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support" depends on PCI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select I2C
Commit message said you changed IGB to use depends I2C, but the content doesn't...
Quoted 46 lines
drivers/net/ethernet/intel/Kconfig +4
-5select I2C_ALGOBIT help@@ -159,9 +159,9 @@ config IXGB config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select MDIO select PHYLIB - imply PTP_1588_CLOCK help This driver supports Intel(R) 10GbE PCI Express family of adapters. For more information on how to identify your adapter, go@@ -239,7 +239,7 @@ config IXGBEVF_IPSEC config I40E tristate "Intel(R) Ethernet Controller XL710 Family support" - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK depends on PCI select AUXILIARY_BUS help@@ -295,11 +295,11 @@ config ICE tristate "Intel(R) Ethernet Connection E800 Series Support" default n depends on PCI_MSI + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK select AUXILIARY_BUS select DIMLIB select NET_DEVLINK select PLDMFW - imply PTP_1588_CLOCK help This driver supports Intel(R) Ethernet Connection E800 Series of devices. For more information on how to identify your adapter, go@@ -317,7 +317,7 @@ config FM10K tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support" default n depends on PCI_MSI - imply PTP_1588_CLOCK + depends on PTP_1588_CLOCK || !PTP_1588_CLOCK help This driver supports Intel(R) FM10000 Ethernet Switch Host Interface. For more information on how to identify your adapter, --2.29.2
Quoted 50 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Arnd Bergmann
Sent: Monday, July 26, 2021 2:15 PM
To: Brandeburg, Jesse <[email protected]>; Nguyen, Anthony L <[email protected]>; David S. Miller <[email protected]>; Jakub Kicinski <[email protected]>; Keller, Jacob E <[email protected]>
Cc: Arnd Bergmann <[email protected]>; netdev at vger.kernel.org; Kurt Kanzenbach <[email protected]>; linux-kernel at vger.kernel.org; intel- wired-lan at lists.osuosl.org; Saleem, Shiraz <[email protected]>
Subject: [Intel-wired-lan] [PATCH] ethernet/intel: fixPTP_1588_CLOCKdependenciesFrom: Arnd Bergmann <[email protected]>
The 'imply' keyword does not do what most people think it does, it only politely asks
Kconfigto turn on another symbol, but does not prevent it from being disabled manually or built as a loadable module when the user is built- in. In the ICE driver, the latter now causes a link failure:aarch64-linux-ld:
drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_eth_ioctl':
ice_main.c:(.text+0x13b0): undefined reference toice_ptp_get_ts_config' ice_main.c:(.text+0x13b0): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbolice_ptp_get_ts_config'
aarch64-linux-ld: ice_main.c:(.text+0x13bc): undefined reference to `ice_ptp_set_ts_config'
ice_main.c:(.text+0x13bc): relocation truncated to fit:R_AARCH64_CALL26against undefined symbol `ice_ptp_set_ts_config'
aarch64-linux-ld:drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_prepare_for_reset':
ice_main.c:(.text+0x31fc): undefined reference toice_ptp_release' ice_main.c:(.text+0x31fc): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbolice_ptp_release'
aarch64-linux-ld:drivers/net/ethernet/intel/ice/ice_main.o: in function `ice_rebuild':For the other Intel network drivers, there is no link error when the drivers are built-in and PTP is a loadable module, because
linux/ptp_clock_kernel.hcontains anIS_REACHABLE()check, but this just changes the compile-time failure to a runtime failure, which is arguably worse.Change all the Intel drivers to use the 'depends on
PTP_1588_CLOCK|| !PTP_1588_CLOCK' trick to prevent the broken configuration, as we already do for several other drivers. To avoid circular dependencies, this also requires changing the IGB driver back to using the normal 'depends on I2C' instead of 'select I2C'.
Quoted 7 lines
Fixes 06c16d89d2cb ("ice: register 1588 PTP clock device object for E810devices")
Signed-off-by Arnd Bergmann <[email protected]>--- drivers/net/ethernet/intel/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Quoted 7 lines · GurucharanX
Quoted 7 lines
From: Arnd Bergmann <[email protected]>
The 'imply' keyword does not do what most people think it does, it only politely asks
Kconfigto turn on another symbol, but does not prevent it from being disabled manually or built as a loadable module when the user is built- in. In the ICE driver, the latter now causes a link failure:
...
Quoted 1 line
Sorry for the delay. I had remembered that there was a previous discussion about that option but couldn't find the thread at first.
I now found
https://lore.kernel.org/netdev/CAK8P3a3=eOxE-K25754+fB_-i_0BZzf9a9RfPTX3ppSwu9WZXw at mail.gmail.com/
and will add Richard to Cc for my new version as well, just in case he has objections
to this version and wants to fix it differently.
Arnd