[1/3] net: ethernet: ti-cpsw: select CONFIG_GENERIC_ALLOCATOR

Message ID 20230612124024.520720-1-arnd@kernel.org
State New
Headers
Series [1/3] net: ethernet: ti-cpsw: select CONFIG_GENERIC_ALLOCATOR |

Commit Message

Arnd Bergmann June 12, 2023, 12:40 p.m. UTC
  From: Arnd Bergmann <arnd@arndb.de>

The dependency was lost for both cpsw and davinci-emac, but only
added back for the emac driver, so a cpsw-only build can still fail:

x86_64-linux-ld: vmlinux.o: in function `cpdma_desc_pool_destroy':
davinci_cpdma.c:(.text+0xd9fb97): undefined reference to `gen_pool_size'
x86_64-linux-ld: davinci_cpdma.c:(.text+0xd9fba8): undefined reference to `gen_pool_avail'
x86_64-linux-ld: vmlinux.o: in function `cpdma_desc_pool_create':
davinci_cpdma.c:(.text+0xd9fd21): undefined reference to `devm_gen_pool_create'
x86_64-linux-ld: davinci_cpdma.c:(.text+0xd9fe15): undefined reference to `gen_pool_add_owner'
x86_64-linux-ld: vmlinux.o: in function `__cpdma_chan_free':
davinci_cpdma.c:(.text+0xd9ffde): undefined reference to `gen_pool_free_owner'
x86_64-linux-ld: vmlinux.o: in function `cpdma_chan_submit_si':
davinci_cpdma.c:(.text+0xda039e): undefined reference to `gen_pool_alloc_algo_owner'
x86_64-linux-ld: davinci_cpdma.c:(.text+0xda064f): undefined reference to `gen_pool_free_owner'
x86_64-linux-ld: vmlinux.o: in function `cpdma_check_free_tx_desc':

Fixes: b2ef81dcdf383 ("net: ethernet: ti: Add dependency for TI_DAVINCI_EMAC")
Fixes: 99f6297182729 ("net: ethernet: ti: cpsw: drop TI_DAVINCI_CPDMA config option")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/ethernet/ti/Kconfig | 2 ++
 1 file changed, 2 insertions(+)
  

Patch

diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index fce06663e1e11..18b2160a96260 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -51,6 +51,7 @@  config TI_CPSW
 	tristate "TI CPSW Switch Support"
 	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
 	depends on TI_CPTS || !TI_CPTS
+	select GENERIC_ALLOCATOR
 	select TI_DAVINCI_MDIO
 	select MFD_SYSCON
 	select PAGE_POOL
@@ -67,6 +68,7 @@  config TI_CPSW_SWITCHDEV
 	depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
 	depends on NET_SWITCHDEV
 	depends on TI_CPTS || !TI_CPTS
+	select GENERIC_ALLOCATOR
 	select PAGE_POOL
 	select TI_DAVINCI_MDIO
 	select MFD_SYSCON