[PATCH net-next] net: sparx5: add missing lan969x Kconfig dependency

[PATCH net-next] net: sparx5: add missing lan969x Kconfig dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The sparx5 switchdev driver can be built either with or without support
for the Lan969x switch. However, it cannot be built-in when the lan969x
driver is a loadable module because of a link-time dependency:

arm-linux-gnueabi-ld: drivers/net/ethernet/microchip/sparx5/sparx5_main.o:(.rodata+0xd44): undefined reference to `lan969x_desc'

Add a Kconfig dependency to reflect this in Kconfig, allowing all
the valid configurations but forcing sparx5 to be a loadable module
as well if lan969x is.

Fixes: 98a01119608d ("net: sparx5: add compatible string for lan969x")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Side note: given that lan969x is always built as part of sparx5,
wouldn't it make more sense to move all of it into the sparx5
subdirectory?
---
 drivers/net/ethernet/microchip/lan969x/Kconfig  | 2 +-
 drivers/net/ethernet/microchip/lan969x/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan969x/Kconfig b/drivers/net/ethernet/microchip/lan969x/Kconfig
index 728180d3fa33..c5c6122ae2ec 100644
--- a/drivers/net/ethernet/microchip/lan969x/Kconfig
+++ b/drivers/net/ethernet/microchip/lan969x/Kconfig
@@ -1,5 +1,5 @@
 config LAN969X_SWITCH
-	tristate "Lan969x switch driver"
+	bool "Lan969x switch driver"
 	depends on SPARX5_SWITCH
 	help
 	  This driver supports the lan969x family of network switch devices.
diff --git a/drivers/net/ethernet/microchip/lan969x/Makefile b/drivers/net/ethernet/microchip/lan969x/Makefile
index 9a2351b4f111..316405cbbc71 100644
--- a/drivers/net/ethernet/microchip/lan969x/Makefile
+++ b/drivers/net/ethernet/microchip/lan969x/Makefile
@@ -3,7 +3,7 @@
 # Makefile for the Microchip lan969x network device drivers.
 #
 
-obj-$(CONFIG_LAN969X_SWITCH) += lan969x-switch.o
+obj-$(CONFIG_SPARX5_SWITCH) += lan969x-switch.o
 
 lan969x-switch-y := lan969x_regs.o lan969x.o lan969x_calendar.o \
  lan969x_vcap_ag_api.o lan969x_vcap_impl.o
-- 
2.39.5

Re: [PATCH net-next] net: sparx5: add missing lan969x Kconfig dependency

[Daniel Machon]

Hi Arnd,

> From: Arnd Bergmann <arnd@arndb.de>
> 
> The sparx5 switchdev driver can be built either with or without support
> for the Lan969x switch. However, it cannot be built-in when the lan969x
> driver is a loadable module because of a link-time dependency:
> 
> arm-linux-gnueabi-ld: drivers/net/ethernet/microchip/sparx5/sparx5_main.o:(.rodata+0xd44): undefined reference to `lan969x_desc'
> 
> Add a Kconfig dependency to reflect this in Kconfig, allowing all
> the valid configurations but forcing sparx5 to be a loadable module
> as well if lan969x is.

Checked the different configurations and the change fixed it. Thanks!

> 
> Fixes: 98a01119608d ("net: sparx5: add compatible string for lan969x")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Side note: given that lan969x is always built as part of sparx5,
> wouldn't it make more sense to move all of it into the sparx5
> subdirectory?
> ---

IDK .. I think I prefer it *not* being hidden under the sparx5 dir. If
we have any guidelines for this, I will gladly comply. :-)

/Daniel

Reviewed-by: Daniel Machon <daniel.machon@microchip.com>

Re: [PATCH net-next] net: sparx5: add missing lan969x Kconfig dependency

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 13 Nov 2024 12:55:08 +0100 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The sparx5 switchdev driver can be built either with or without support
> for the Lan969x switch. However, it cannot be built-in when the lan969x
> driver is a loadable module because of a link-time dependency:
> 
> arm-linux-gnueabi-ld: drivers/net/ethernet/microchip/sparx5/sparx5_main.o:(.rodata+0xd44): undefined reference to `lan969x_desc'
> 
> [...]

Here is the summary with links:
  - [net-next] net: sparx5: add missing lan969x Kconfig dependency
    https://git.kernel.org/netdev/net-next/c/4c54e9497d9a

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html