Revert "ethernet: octeontx2: avoid linking objects into multiple modules"

This reverts commit 727c94c9539aa8865cdbf6a783da6a6585f1fec2.

Stephen reports that this commit causes a circular module dependency
for him. Revert, and we'll try to address the problem, again.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/all/20240531152223.25591c8e@canb.auug.org.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/Makefile b/drivers/net/ethernet/marvell/octeontx2/nic/Makefile
index e4c5dc46dd42d070ccf39623793998e0e9a18a20..5664f768cb0cd1711ada99605efc0861957452d9 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/Makefile
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/Makefile
@@ -3,18 +3,16 @@
 # Makefile for Marvell's RVU Ethernet device drivers
 #
 
-obj-$(CONFIG_OCTEONTX2_PF) += rvu_nicpf.o otx2_ptp.o otx2_devlink.o
-obj-$(CONFIG_OCTEONTX2_VF) += rvu_nicvf.o otx2_ptp.o otx2_devlink.o
+obj-$(CONFIG_OCTEONTX2_PF) += rvu_nicpf.o otx2_ptp.o
+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 \
-               qos_sq.o qos.o
-rvu_nicvf-y := otx2_vf.o
+               otx2_devlink.o qos_sq.o qos.o
+rvu_nicvf-y := otx2_vf.o otx2_devlink.o
 
-ifdef CONFIG_DCB
-obj-$(CONFIG_OCTEONTX2_PF) += otx2_dcbnl.o
-obj-$(CONFIG_OCTEONTX2_VF) += otx2_dcbnl.o
-endif
+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 0d7e611d9a05a69488224f3ce77b355f89134c44..28fb643d2917f702e52b74cf31a734a299ded243 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
@@ -54,7 +54,6 @@ int otx2_pfc_txschq_config(struct otx2_nic *pfvf)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(otx2_pfc_txschq_config);
 
 static int otx2_pfc_txschq_alloc_one(struct otx2_nic *pfvf, u8 prio)
 {
@@ -123,7 +122,6 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(otx2_pfc_txschq_alloc);
 
 static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
 {
@@ -262,7 +260,6 @@ update_sq_smq_map:
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(otx2_pfc_txschq_update);
 
 int otx2_pfc_txschq_stop(struct otx2_nic *pfvf)
 {
@@ -285,7 +282,6 @@ int otx2_pfc_txschq_stop(struct otx2_nic *pfvf)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(otx2_pfc_txschq_stop);
 
 int otx2_config_priority_flow_ctrl(struct otx2_nic *pfvf)
 {
@@ -325,7 +321,6 @@ unlock:
        mutex_unlock(&pfvf->mbox.lock);
        return err;
 }
-EXPORT_SYMBOL_GPL(otx2_config_priority_flow_ctrl);
 
 void otx2_update_bpid_in_rqctx(struct otx2_nic *pfvf, int vlan_prio, int qidx,
                               bool pfc_enable)
@@ -390,7 +385,6 @@ out:
                         "Updating BPIDs in CQ and Aura contexts of RQ%d failed with err %d\n",
                         qidx, err);
 }
-EXPORT_SYMBOL_GPL(otx2_update_bpid_in_rqctx);
 
 static int otx2_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc)
 {
@@ -478,8 +472,3 @@ int otx2_dcbnl_set_ops(struct net_device *dev)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(otx2_dcbnl_set_ops);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Marvell RVU dcbnl");
-MODULE_AUTHOR("Sunil Goutham <sgoutham@marvell.com>");

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
index 440f574d11958b8a8f2c48943c0ca16889267b3f..99ddf31269d96313ad79ed11f92a3ca9a82c163a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c
@@ -113,7 +113,6 @@ err_dl:
        devlink_free(dl);
        return err;
 }
-EXPORT_SYMBOL_GPL(otx2_register_dl);
 
 void otx2_unregister_dl(struct otx2_nic *pfvf)
 {
@@ -125,8 +124,3 @@ void otx2_unregister_dl(struct otx2_nic *pfvf)
                                  ARRAY_SIZE(otx2_dl_params));
        devlink_free(dl);
 }
-EXPORT_SYMBOL_GPL(otx2_unregister_dl);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Marvell RVU PF/VF Netdev Devlink");
-MODULE_AUTHOR("Sunil Goutham <sgoutham@marvell.com>");