net: enetc: add RSS support for i.MX95 ENETC PF

Compared with LS1028A, there are two main differences: first, i.MX95
ENETC uses NTMP 2.0 to manage the RSS table, and second, the offset
of the RSS Key registers is different. Some modifications have been
made in the previous patches based on these differences to ensure that
the relevant interfaces are compatible with i.MX95. So it's time to
add RSS support to i.MX95 ENETC PF.

Signed-off-by: Wei Fang <wei.fang@nxp.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20250506080735.3444381-9-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 494f8f77bf4cb7e9613d89dc8d7dea956bd37233..08762772c0451c66324327ad604266a5f71e7334 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -2446,10 +2446,7 @@ int enetc_configure_si(struct enetc_ndev_priv *priv)
        if (si->hw_features & ENETC_SI_F_LSO)
                enetc_set_lso_flags_mask(hw);
 
-       /* TODO: RSS support for i.MX95 will be supported later, and the
-        * is_enetc_rev1() condition will be removed
-        */
-       if (si->num_rss && is_enetc_rev1(si)) {
+       if (si->num_rss) {
                err = enetc_setup_default_rss_table(si, priv->num_rx_rings);
                if (err)
                        return err;

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index e49c1626e7e56443199cb123561e6ea545e0d57f..7b24f1a5969aa85631d65cb25716b24d14c664f2 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -541,6 +541,8 @@ void enetc_set_rss_key(struct enetc_si *si, const u8 *bytes);
 int enetc_get_rss_table(struct enetc_si *si, u32 *table, int count);
 int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count);
 int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd);
+int enetc4_get_rss_table(struct enetc_si *si, u32 *table, int count);
+int enetc4_set_rss_table(struct enetc_si *si, const u32 *table, int count);
 
 static inline void *enetc_cbd_alloc_data_mem(struct enetc_si *si,
                                             struct enetc_cbd *cbd,

diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
index d2a414c28c21ecba0d1130c56bd0085967be5788..2d890f7bcc95ef63a24fd27a8b336ab29f77561a 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c
@@ -523,6 +523,14 @@ static void enetc4_pf_set_rx_mode(struct net_device *ndev)
        queue_work(si->workqueue, &si->rx_mode_task);
 }
 
+static int enetc4_pf_set_features(struct net_device *ndev,
+                                 netdev_features_t features)
+{
+       enetc_set_features(ndev, features);
+
+       return 0;
+}
+
 static const struct net_device_ops enetc4_ndev_ops = {
        .ndo_open               = enetc_open,
        .ndo_stop               = enetc_close,
@@ -530,6 +538,7 @@ static const struct net_device_ops enetc4_ndev_ops = {
        .ndo_get_stats          = enetc_get_stats,
        .ndo_set_mac_address    = enetc_pf_set_mac_addr,
        .ndo_set_rx_mode        = enetc4_pf_set_rx_mode,
+       .ndo_set_features       = enetc4_pf_set_features,
 };
 
 static struct phylink_pcs *
@@ -957,6 +966,11 @@ static void enetc4_pf_netdev_destroy(struct enetc_si *si)
        free_netdev(ndev);
 }
 
+static const struct enetc_si_ops enetc4_psi_ops = {
+       .get_rss_table = enetc4_get_rss_table,
+       .set_rss_table = enetc4_set_rss_table,
+};
+
 static int enetc4_pf_probe(struct pci_dev *pdev,
                           const struct pci_device_id *ent)
 {
@@ -981,6 +995,7 @@ static int enetc4_pf_probe(struct pci_dev *pdev,
                                     "Couldn't map PF only space\n");
 
        si->revision = enetc_get_ip_revision(&si->hw);
+       si->ops = &enetc4_psi_ops;
        err = enetc_get_driver_data(si);
        if (err)
                return dev_err_probe(dev, err,

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c b/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
index 71e4da5300282bcafff46aa71683853db4f1b90f..3d5f31879d5c64bfc853bb4e7f99d3963b867e32 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c
@@ -294,3 +294,15 @@ int enetc_set_rss_table(struct enetc_si *si, const u32 *table, int count)
        return enetc_cmd_rss_table(si, (u32 *)table, count, false);
 }
 EXPORT_SYMBOL_GPL(enetc_set_rss_table);
+
+int enetc4_get_rss_table(struct enetc_si *si, u32 *table, int count)
+{
+       return ntmp_rsst_query_entry(&si->ntmp_user, table, count);
+}
+EXPORT_SYMBOL_GPL(enetc4_get_rss_table);
+
+int enetc4_set_rss_table(struct enetc_si *si, const u32 *table, int count)
+{
+       return ntmp_rsst_update_entry(&si->ntmp_user, table, count);
+}
+EXPORT_SYMBOL_GPL(enetc4_set_rss_table);

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index 33a91babb0b2cc3ba058238f166047c2348b9606..d38cd36be4a658a5c373caf5596614fda228184e 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -625,6 +625,29 @@ static int enetc_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,
        return 0;
 }
 
+/* i.MX95 ENETC does not support RFS table, but we can use ingress port
+ * filter table to implement Wake-on-LAN filter or drop the matched flow,
+ * so the implementation will be different from enetc_get_rxnfc() and
+ * enetc_set_rxnfc(). Therefore, add enetc4_get_rxnfc() for ENETC v4 PF.
+ */
+static int enetc4_get_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc,
+                           u32 *rule_locs)
+{
+       struct enetc_ndev_priv *priv = netdev_priv(ndev);
+
+       switch (rxnfc->cmd) {
+       case ETHTOOL_GRXRINGS:
+               rxnfc->data = priv->num_rx_rings;
+               break;
+       case ETHTOOL_GRXFH:
+               return enetc_get_rsshash(rxnfc);
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
 static int enetc_set_rxnfc(struct net_device *ndev, struct ethtool_rxnfc *rxnfc)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
@@ -685,22 +708,29 @@ static int enetc_get_rss_key_base(struct enetc_si *si)
        return ENETC4_PRSSKR(0);
 }
 
+static void enetc_get_rss_key(struct enetc_si *si, const u8 *key)
+{
+       int base = enetc_get_rss_key_base(si);
+       struct enetc_hw *hw = &si->hw;
+       int i;
+
+       for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
+               ((u32 *)key)[i] = enetc_port_rd(hw, base + i * 4);
+}
+
 static int enetc_get_rxfh(struct net_device *ndev,
                          struct ethtool_rxfh_param *rxfh)
 {
        struct enetc_ndev_priv *priv = netdev_priv(ndev);
        struct enetc_si *si = priv->si;
-       struct enetc_hw *hw = &si->hw;
-       int err = 0, i;
+       int err = 0;
 
        /* return hash function */
        rxfh->hfunc = ETH_RSS_HASH_TOP;
 
        /* return hash key */
-       if (rxfh->key && hw->port)
-               for (i = 0; i < ENETC_RSSHASH_KEY_SIZE / 4; i++)
-                       ((u32 *)rxfh->key)[i] = enetc_port_rd(hw,
-                                                             ENETC_PRSSK(i));
+       if (rxfh->key && enetc_si_is_pf(si))
+               enetc_get_rss_key(si, rxfh->key);
 
        /* return RSS table */
        if (rxfh->indir)
@@ -1249,6 +1279,11 @@ const struct ethtool_ops enetc4_pf_ethtool_ops = {
        .set_wol = enetc_set_wol,
        .get_pauseparam = enetc_get_pauseparam,
        .set_pauseparam = enetc_set_pauseparam,
+       .get_rxnfc = enetc4_get_rxnfc,
+       .get_rxfh_key_size = enetc_get_rxfh_key_size,
+       .get_rxfh_indir_size = enetc_get_rxfh_indir_size,
+       .get_rxfh = enetc_get_rxfh,
+       .set_rxfh = enetc_set_rxfh,
 };
 
 void enetc_set_ethtool_ops(struct net_device *ndev)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
index 0a95f2ac781af7b928e62b552a8cdc163f645448..a302477c4de49945de038533be90cfc0cd935ab8 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
@@ -128,15 +128,15 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
        if (si->hw_features & ENETC_SI_F_LSO)
                priv->active_offloads |= ENETC_F_LSO;
 
+       if (si->num_rss)
+               ndev->hw_features |= NETIF_F_RXHASH;
+
        /* TODO: currently, i.MX95 ENETC driver does not support advanced features */
        if (!is_enetc_rev1(si)) {
                ndev->hw_features &= ~(NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK);
                goto end;
        }
 
-       if (si->num_rss)
-               ndev->hw_features |= NETIF_F_RXHASH;
-
        ndev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |
                             NETDEV_XDP_ACT_NDO_XMIT | NETDEV_XDP_ACT_RX_SG |
                             NETDEV_XDP_ACT_NDO_XMIT_SG;