Skip to content

Commit a602ee3

Browse files
danish-tiPaolo Abeni
authored andcommitted
net: ethernet: ti: Fix mixed module-builtin object
With CONFIG_TI_K3_AM65_CPSW_NUSS=y and CONFIG_TI_ICSSG_PRUETH=m, k3-cppi-desc-pool.o is linked to a module and also to vmlinux even though the expected CFLAGS are different between builtins and modules. The build system is complaining about the following: k3-cppi-desc-pool.o is added to multiple modules: icssg-prueth ti-am65-cpsw-nuss Introduce the new module, k3-cppi-desc-pool, to provide the common functions to ti-am65-cpsw-nuss and icssg-prueth. Fixes: 128d587 ("net: ti: icssg-prueth: Add ICSSG ethernet driver") Signed-off-by: MD Danish Anwar <danishanwar@ti.com> Link: https://lore.kernel.org/r/20231018064936.3146846-1-danishanwar@ti.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 9b9ac46 commit a602ee3

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

drivers/net/ethernet/ti/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,16 @@ config TI_CPTS
9090
The unit can time stamp PTP UDP/IPv4 and Layer 2 packets, and the
9191
driver offers a PTP Hardware Clock.
9292

93+
config TI_K3_CPPI_DESC_POOL
94+
tristate
95+
9396
config TI_K3_AM65_CPSW_NUSS
9497
tristate "TI K3 AM654x/J721E CPSW Ethernet driver"
9598
depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER
9699
select NET_DEVLINK
97100
select TI_DAVINCI_MDIO
98101
select PHYLINK
102+
select TI_K3_CPPI_DESC_POOL
99103
imply PHY_TI_GMII_SEL
100104
depends on TI_K3_AM65_CPTS || !TI_K3_AM65_CPTS
101105
help
@@ -187,6 +191,7 @@ config TI_ICSSG_PRUETH
187191
tristate "TI Gigabit PRU Ethernet driver"
188192
select PHYLIB
189193
select TI_ICSS_IEP
194+
select TI_K3_CPPI_DESC_POOL
190195
depends on PRU_REMOTEPROC
191196
depends on ARCH_K3 && OF && TI_K3_UDMA_GLUE_LAYER
192197
help

drivers/net/ethernet/ti/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ keystone_netcp-y := netcp_core.o cpsw_ale.o
2424
obj-$(CONFIG_TI_KEYSTONE_NETCP_ETHSS) += keystone_netcp_ethss.o
2525
keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o cpsw_ale.o
2626

27+
obj-$(CONFIG_TI_K3_CPPI_DESC_POOL) += k3-cppi-desc-pool.o
28+
2729
obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o
28-
ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o k3-cppi-desc-pool.o am65-cpsw-qos.o
30+
ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o am65-cpsw-qos.o
2931
ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o
3032
obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o
3133

3234
obj-$(CONFIG_TI_ICSSG_PRUETH) += icssg-prueth.o
33-
icssg-prueth-y := k3-cppi-desc-pool.o \
34-
icssg/icssg_prueth.o \
35+
icssg-prueth-y := icssg/icssg_prueth.o \
3536
icssg/icssg_classifier.o \
3637
icssg/icssg_queues.o \
3738
icssg/icssg_config.o \

drivers/net/ethernet/ti/k3-cppi-desc-pool.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ void k3_cppi_desc_pool_destroy(struct k3_cppi_desc_pool *pool)
3939

4040
gen_pool_destroy(pool->gen_pool); /* frees pool->name */
4141
}
42+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_destroy);
4243

4344
struct k3_cppi_desc_pool *
4445
k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
@@ -98,29 +99,38 @@ k3_cppi_desc_pool_create_name(struct device *dev, size_t size,
9899
devm_kfree(pool->dev, pool);
99100
return ERR_PTR(ret);
100101
}
102+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_create_name);
101103

102104
dma_addr_t k3_cppi_desc_pool_virt2dma(struct k3_cppi_desc_pool *pool,
103105
void *addr)
104106
{
105107
return addr ? pool->dma_addr + (addr - pool->cpumem) : 0;
106108
}
109+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_virt2dma);
107110

108111
void *k3_cppi_desc_pool_dma2virt(struct k3_cppi_desc_pool *pool, dma_addr_t dma)
109112
{
110113
return dma ? pool->cpumem + (dma - pool->dma_addr) : NULL;
111114
}
115+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_dma2virt);
112116

113117
void *k3_cppi_desc_pool_alloc(struct k3_cppi_desc_pool *pool)
114118
{
115119
return (void *)gen_pool_alloc(pool->gen_pool, pool->desc_size);
116120
}
121+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_alloc);
117122

118123
void k3_cppi_desc_pool_free(struct k3_cppi_desc_pool *pool, void *addr)
119124
{
120125
gen_pool_free(pool->gen_pool, (unsigned long)addr, pool->desc_size);
121126
}
127+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_free);
122128

123129
size_t k3_cppi_desc_pool_avail(struct k3_cppi_desc_pool *pool)
124130
{
125131
return gen_pool_avail(pool->gen_pool) / pool->desc_size;
126132
}
133+
EXPORT_SYMBOL_GPL(k3_cppi_desc_pool_avail);
134+
135+
MODULE_LICENSE("GPL");
136+
MODULE_DESCRIPTION("TI K3 CPPI5 descriptors pool API");

0 commit comments

Comments
 (0)