Skip to content

Commit 1062d03

Browse files
Geetha sowjanyadavem330
authored andcommitted
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: 8e67558 ("octeontx2-pf: PFC config support with DCBx"). Signed-off-by: Geetha sowjanya <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b95a4af commit 1062d03

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

drivers/net/ethernet/marvell/octeontx2/nic/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ obj-$(CONFIG_OCTEONTX2_VF) += rvu_nicvf.o otx2_ptp.o
99
rvu_nicpf-y := otx2_pf.o otx2_common.o otx2_txrx.o otx2_ethtool.o \
1010
otx2_flows.o otx2_tc.o cn10k.o otx2_dmac_flt.o \
1111
otx2_devlink.o qos_sq.o qos.o
12-
rvu_nicvf-y := otx2_vf.o otx2_devlink.o
12+
rvu_nicvf-y := otx2_vf.o
1313

1414
rvu_nicpf-$(CONFIG_DCB) += otx2_dcbnl.o
15-
rvu_nicvf-$(CONFIG_DCB) += otx2_dcbnl.o
1615
rvu_nicpf-$(CONFIG_MACSEC) += cn10k_macsec.o
1716

1817
ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af

drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ int otx2_pfc_txschq_config(struct otx2_nic *pfvf)
5454

5555
return 0;
5656
}
57+
EXPORT_SYMBOL(otx2_pfc_txschq_config);
5758

5859
static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)
5960
{
@@ -122,6 +123,7 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)
122123

123124
return 0;
124125
}
126+
EXPORT_SYMBOL(otx2_pfc_txschq_alloc);
125127

126128
static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
127129
{
@@ -260,6 +262,7 @@ int otx2_pfc_txschq_update(struct otx2_nic *pfvf)
260262

261263
return 0;
262264
}
265+
EXPORT_SYMBOL(otx2_pfc_txschq_update);
263266

264267
int otx2_pfc_txschq_stop(struct otx2_nic *pfvf)
265268
{
@@ -282,6 +285,7 @@ int otx2_pfc_txschq_stop(struct otx2_nic *pfvf)
282285

283286
return 0;
284287
}
288+
EXPORT_SYMBOL(otx2_pfc_txschq_stop);
285289

286290
int otx2_config_priority_flow_ctrl(struct otx2_nic *pfvf)
287291
{
@@ -321,6 +325,7 @@ int otx2_config_priority_flow_ctrl(struct otx2_nic *pfvf)
321325
mutex_unlock(&pfvf->mbox.lock);
322326
return err;
323327
}
328+
EXPORT_SYMBOL(otx2_config_priority_flow_ctrl);
324329

325330
void otx2_update_bpid_in_rqctx(struct otx2_nic *pfvf, int vlan_prio, int qidx,
326331
bool pfc_enable)
@@ -385,6 +390,7 @@ void otx2_update_bpid_in_rqctx(struct otx2_nic *pfvf, int vlan_prio, int qidx,
385390
"Updating BPIDs in CQ and Aura contexts of RQ%d failed with err %d\n",
386391
qidx, err);
387392
}
393+
EXPORT_SYMBOL(otx2_update_bpid_in_rqctx);
388394

389395
static int otx2_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc)
390396
{
@@ -472,3 +478,4 @@ int otx2_dcbnl_set_ops(struct net_device *dev)
472478

473479
return 0;
474480
}
481+
EXPORT_SYMBOL(otx2_dcbnl_set_ops);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ int otx2_register_dl(struct otx2_nic *pfvf)
113113
devlink_free(dl);
114114
return err;
115115
}
116+
EXPORT_SYMBOL(otx2_register_dl);
116117

117118
void otx2_unregister_dl(struct otx2_nic *pfvf)
118119
{
@@ -124,3 +125,4 @@ void otx2_unregister_dl(struct otx2_nic *pfvf)
124125
ARRAY_SIZE(otx2_dl_params));
125126
devlink_free(dl);
126127
}
128+
EXPORT_SYMBOL(otx2_unregister_dl);

0 commit comments

Comments
 (0)