net: enetc: add set/get_rss_table() hooks to enetc_si_ops

Since i.MX95 ENETC (v4) uses NTMP 2.0 to manage the RSS table, which is
different from LS1028A ENETC (v1). In order to reuse some functions
related to the RSS table, so add .get_rss_table() and .set_rss_table()
hooks to enetc_si_ops.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250506080735.3444381-7-wei.fang@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 5a7af44e45946ef7e5b2a19456c6eec3fdc3663b..494f8f77bf4cb7e9613d89dc8d7dea956bd37233 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2415,7 +2415,7 @@ static int enetc_setup_default_rss_table(struct enetc_si *si, int num_groups)
        for (i = 0; i < si->num_rss; i++)
                rss_table[i] = i % num_groups;
 
-       enetc_set_rss_table(si, rss_table, si->num_rss);
+       si->ops->set_rss_table(si, rss_table, si->num_rss);
 
        kfree(rss_table);
 

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index b53ecc882a90a02167331f9642c00aac63d13831..786042029b1e821402979f40f01ab385409cc2ab 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -279,6 +279,19 @@ struct enetc_platform_info {
        const struct enetc_drvdata *data;
 };
 
+struct enetc_si;
+
+/*
+ * This structure defines the some common hooks for ENETC PSI and VSI.
+ * In addition, since VSI only uses the struct enetc_si as its private
+ * driver data, so this structure also define some hooks specifically
+ * for VSI. For VSI-specific hooks, the format is ‘vf_*()’.
+ */
+struct enetc_si_ops {
+       int (*get_rss_table)(struct enetc_si *si, u32 *table, int count);
+       int (*set_rss_table)(struct enetc_si *si, const u32 *table, int count);
+};
+
 /* PCI IEP device data */
 struct enetc_si {
        struct pci_dev *pdev;

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index f47c8b6cc511808cd399364c0825ee0f781f0904..5c51cf7ea439a87923cf16c080a7fd8b841eedef 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -681,7 +681,8 @@ static int enetc_get_rxfh(struct net_device *ndev,
                          struct ethtool_rxfh_param *rxfh)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
-       struct enetc_hw *hw = &priv->si->hw;
+       struct enetc_si *si = priv->si;
+       struct enetc_hw *hw = &si->hw;
        int err = 0, i;
 
        /* return hash function */
@@ -695,8 +696,7 @@ static int enetc_get_rxfh(struct net_device *ndev,
 
        /* return RSS table */
        if (rxfh->indir)
-               err = enetc_get_rss_table(priv->si, rxfh->indir,
-                                         priv->si->num_rss);
+               err = si->ops->get_rss_table(si, rxfh->indir, si->num_rss);
 
        return err;
 }
@@ -715,7 +715,8 @@ static int enetc_set_rxfh(struct net_device *ndev,
                          struct netlink_ext_ack *extack)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
-       struct enetc_hw *hw = &priv->si->hw;
+       struct enetc_si *si = priv->si;
+       struct enetc_hw *hw = &si->hw;
        int err = 0;
 
        /* set hash key, if PF */
@@ -724,8 +725,7 @@ static int enetc_set_rxfh(struct net_device *ndev,
 
        /* set RSS table */
        if (rxfh->indir)
-               err = enetc_set_rss_table(priv->si, rxfh->indir,
-                                         priv->si->num_rss);
+               err = si->ops->set_rss_table(si, rxfh->indir, si->num_rss);
 
        return err;
 }

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index f76403f7aee81d8c60edf1723c30c97b00f3e637..8dabb80ec04c9d67366b4d5e02e2eeb13e1e00f5 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -905,6 +905,11 @@ static int enetc_pf_register_with_ierb(struct pci_dev *pdev)
        return enetc_ierb_register_pf(ierb_pdev, pdev);
 }
 
+static const struct enetc_si_ops enetc_psi_ops = {
+       .get_rss_table = enetc_get_rss_table,
+       .set_rss_table = enetc_set_rss_table,
+};
+
 static struct enetc_si *enetc_psi_create(struct pci_dev *pdev)
 {
        struct enetc_si *si;
@@ -924,6 +929,7 @@ static struct enetc_si *enetc_psi_create(struct pci_dev *pdev)
        }
 
        si->revision = enetc_get_ip_revision(&si->hw);
+       si->ops = &enetc_psi_ops;
        err = enetc_get_driver_data(si);
        if (err) {
                dev_err(&pdev->dev, "Could not get PF driver data\n");

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_vf.c b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
index 3768752b6008b37eeccfddce3587d33904195e26..4fafe4e18a37d026af9a61ca92be5d66daf0279e 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_vf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_vf.c
@@ -162,6 +162,11 @@ static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
        enetc_load_primary_mac_addr(&si->hw, ndev);
 }
 
+static const struct enetc_si_ops enetc_vsi_ops = {
+       .get_rss_table = enetc_get_rss_table,
+       .set_rss_table = enetc_set_rss_table,
+};
+
 static int enetc_vf_probe(struct pci_dev *pdev,
                          const struct pci_device_id *ent)
 {
@@ -176,6 +181,7 @@ static int enetc_vf_probe(struct pci_dev *pdev,
 
        si = pci_get_drvdata(pdev);
        si->revision = ENETC_REV_1_0;
+       si->ops = &enetc_vsi_ops;
        err = enetc_get_driver_data(si);
        if (err) {
                dev_err_probe(&pdev->dev, err,