octeontx2-pf: Fix linking objects into multiple modules
Geetha sowjanya
maintainerPATCH 1/1 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"
--- 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(-)
drivers/net/ethernet/marvell/octeontx2/nic/Makefile +1 -2
@@ -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
drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c +7 -0
@@ -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);
drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c +2 -0
@@ -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);
Signature · 1 line
2.25.1
Quoted 4 lines · Geetha sowjanya
This patch fixes the below build warning messages that are caused due to linking same files to multiple modules by exporting the required symbols.
Quoted 8 lines
"
scripts/Makefile.build:244:drivers/net/ethernet/marvell/octeontx2/nic/Makefile:
otx2_devlink.o is added to multiple modules:rvu_nicpfrvu_nicvf
scripts/Makefile.build:244:drivers/net/ethernet/marvell/octeontx2/nic/Makefile:
otx2_dcbnl.o is added to multiple modules:rvu_nicpfrvu_nicvf"Fixes 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx").Signed-off-by Geetha sowjanya <[email protected]>
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.
Geethasowjanya Akula
maintainerFrom: Simon Horman <[email protected]>
Sent: Wednesday, June 19, 2024 4:35 PM
To: Geethasowjanya Akula <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Sunil Kovvuri Goutham <[email protected]>; Subbaraya Sundeep Bhatta <[email protected]>; Hariprasad Kelam <[email protected]>
Subject: [EXTERNAL] Re: [net PATCH] octeontx2-pf: Fix linking objects into multiple modules
Quoted 10 lines
Quoted 10 lines
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_nicpfrvu_nicvf
scripts/Makefile.build:244:drivers/net/ethernet/marvell/octeontx2/nic/Makefile:
otx2_dcbnl.o is added to multiple modules:rvu_nicpfrvu_nicvf"
Quoted 8 lines
Quoted 2 lines
Fixes 8e67558177f8 ("octeontx2-pf: PFC config support with DCBx").Signed-off-by Geetha sowjanya <mailto:[email protected]>Thanks Geetha,
I checked and it does not seem to be possible to compile
rvu_nicvfas a built-in andrvu_nicpfas a module, which was my only concern about this.
Yes, it can be ignored as VF can not be enabled without PF driver loaded.
Quoted 1 line
Reviewed-by Simon Horman <mailto:[email protected]>
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · 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_nicpfrvu_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!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html