| Message ID | 20240618061122.6628-1-gakula@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1062d03827b78614259b3b4b992deb27ee6aa84d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] octeontx2-pf: Fix linking objects into multiple modules | expand |
On Tue, Jun 18, 2024 at 11:41:22AM +0530, Geetha sowjanya wrote: > This patch fixes the below build warning messages that are > caused due to linking same files to multiple modules by > exporting the required symbols. > > "scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: > otx2_devlink.o is added to multiple modules: rvu_nicpf rvu_nicvf > > scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: > otx2_dcbnl.o is added to multiple modules: rvu_nicpf rvu_nicvf" > > Fixes: 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx"). > Signed-off-by: Geetha sowjanya <gakula@marvell.com> Thanks Geetha, I checked and it does not seem to be possible to compile rvu_nicvf as a built-in and rvu_nicpf as a module, which was my only concern about this. Reviewed-by: Simon Horman <horms@kernel.org>
From: Simon Horman <horms@kernel.org> Sent: Wednesday, June 19, 2024 4:35 PM To: Geethasowjanya Akula <gakula@marvell.com> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org; kuba@kernel.org; davem@davemloft.net; pabeni@redhat.com; edumazet@google.com; Sunil Kovvuri Goutham <sgoutham@marvell.com>; Subbaraya Sundeep Bhatta <sbhatta@marvell.com>; Hariprasad Kelam <hkelam@marvell.com> Subject: [EXTERNAL] Re: [net PATCH] octeontx2-pf: Fix linking objects into multiple modules >> This patch fixes the below build warning messages that are >> caused due to linking same files to multiple modules by >> exporting the required symbols. >> >> "scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: >> otx2_devlink.o is added to multiple modules: rvu_nicpf rvu_nicvf >> >> scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: >> otx2_dcbnl.o is added to multiple modules: rvu_nicpf rvu_nicvf" >> >> Fixes: 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx"). >> Signed-off-by: Geetha sowjanya <mailto:gakula@marvell.com> >Thanks Geetha, >I checked and it does not seem to be possible to compile >rvu_nicvf as a built-in and rvu_nicpf as a module, >which was my only concern about this. Yes, it can be ignored as VF can not be enabled without PF driver loaded. >Reviewed-by: Simon Horman <mailto:horms@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Tue, 18 Jun 2024 11:41:22 +0530 you wrote: > This patch fixes the below build warning messages that are > caused due to linking same files to multiple modules by > exporting the required symbols. > > "scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: > otx2_devlink.o is added to multiple modules: rvu_nicpf rvu_nicvf > > [...] Here is the summary with links: - [net] octeontx2-pf: Fix linking objects into multiple modules https://git.kernel.org/netdev/net/c/1062d03827b7 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/Makefile b/drivers/net/ethernet/marvell/octeontx2/nic/Makefile index 5664f768cb0c..64a97a0a10ed 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/Makefile +++ b/drivers/net/ethernet/marvell/octeontx2/nic/Makefile @@ -9,10 +9,9 @@ obj-$(CONFIG_OCTEONTX2_VF) += rvu_nicvf.o otx2_ptp.o rvu_nicpf-y := otx2_pf.o otx2_common.o otx2_txrx.o otx2_ethtool.o \ otx2_flows.o otx2_tc.o cn10k.o otx2_dmac_flt.o \ otx2_devlink.o qos_sq.o qos.o -rvu_nicvf-y := otx2_vf.o otx2_devlink.o +rvu_nicvf-y := otx2_vf.o rvu_nicpf-$(CONFIG_DCB) += otx2_dcbnl.o -rvu_nicvf-$(CONFIG_DCB) += otx2_dcbnl.o rvu_nicpf-$(CONFIG_MACSEC) += cn10k_macsec.o ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c index 28fb643d2917..aa01110f04a3 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c @@ -54,6 +54,7 @@ int otx2_pfc_txschq_config(struct otx2_nic *pfvf) return 0; } +EXPORT_SYMBOL(otx2_pfc_txschq_config); static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio) { @@ -122,6 +123,7 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf) return 0; } +EXPORT_SYMBOL(otx2_pfc_txschq_alloc); static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio) { @@ -260,6 +262,7 @@ int otx2_pfc_txschq_update(struct otx2_nic *pfvf) return 0; } +EXPORT_SYMBOL(otx2_pfc_txschq_update); int otx2_pfc_txschq_stop(struct otx2_nic *pfvf) { @@ -282,6 +285,7 @@ int otx2_pfc_txschq_stop(struct otx2_nic *pfvf) return 0; } +EXPORT_SYMBOL(otx2_pfc_txschq_stop); int otx2_config_priority_flow_ctrl(struct otx2_nic *pfvf) { @@ -321,6 +325,7 @@ int otx2_config_priority_flow_ctrl(struct otx2_nic *pfvf) mutex_unlock(&pfvf->mbox.lock); return err; } +EXPORT_SYMBOL(otx2_config_priority_flow_ctrl); void otx2_update_bpid_in_rqctx(struct otx2_nic *pfvf, int vlan_prio, int qidx, bool pfc_enable) @@ -385,6 +390,7 @@ void otx2_update_bpid_in_rqctx(struct otx2_nic *pfvf, int vlan_prio, int qidx, "Updating BPIDs in CQ and Aura contexts of RQ%d failed with err %d\n", qidx, err); } +EXPORT_SYMBOL(otx2_update_bpid_in_rqctx); static int otx2_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc) { @@ -472,3 +478,4 @@ int otx2_dcbnl_set_ops(struct net_device *dev) return 0; } +EXPORT_SYMBOL(otx2_dcbnl_set_ops); diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c index 99ddf31269d9..458d34a62e18 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c @@ -113,6 +113,7 @@ int otx2_register_dl(struct otx2_nic *pfvf) devlink_free(dl); return err; } +EXPORT_SYMBOL(otx2_register_dl); void otx2_unregister_dl(struct otx2_nic *pfvf) { @@ -124,3 +125,4 @@ void otx2_unregister_dl(struct otx2_nic *pfvf) ARRAY_SIZE(otx2_dl_params)); devlink_free(dl); } +EXPORT_SYMBOL(otx2_unregister_dl);
This patch fixes the below build warning messages that are caused due to linking same files to multiple modules by exporting the required symbols. "scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: otx2_devlink.o is added to multiple modules: rvu_nicpf rvu_nicvf scripts/Makefile.build:244: drivers/net/ethernet/marvell/octeontx2/nic/Makefile: otx2_dcbnl.o is added to multiple modules: rvu_nicpf rvu_nicvf" Fixes: 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx"). Signed-off-by: Geetha sowjanya <gakula@marvell.com> --- drivers/net/ethernet/marvell/octeontx2/nic/Makefile | 3 +-- drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 7 +++++++ drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-)