[PATCH net-next 6/8] bnxt_en: Implement ethtool -X to set indirection table.

[Michael Chan]

With the new infrastructure in place, we can now support the setting of
the indirection table from ethtool.

The user-configured indirection table will need to be reset to default
if we are unable to reserve the requested number of RX rings or if the
RSS table size changes.

Signed-off-by: Michael Chan <michael.c...@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c         |  7 ++++-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 34 +++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 87d37dc..eb7f2d4 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -6063,6 +6063,10 @@ static int __bnxt_reserve_rings(struct bnxt *bp)
                rx = rx_rings << 1;
        cp = sh ? max_t(int, tx, rx_rings) : tx + rx_rings;
        bp->tx_nr_rings = tx;
+
+       /* Reset the RSS indirection if we cannot reserve all the RX rings */
+       if (rx_rings != bp->rx_nr_rings)
+               bp->dev->priv_flags &= ~IFF_RXFH_CONFIGURED;
        bp->rx_nr_rings = rx_rings;
        bp->cp_nr_rings = cp;
 
@@ -8267,7 +8271,8 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init)
                        rc = bnxt_init_int_mode(bp);
                bnxt_ulp_irq_restart(bp, rc);
        }
-       bnxt_set_dflt_rss_indir_tbl(bp);
+       if (!netif_is_rxfh_configured(bp->dev))
+               bnxt_set_dflt_rss_indir_tbl(bp);
 
        if (rc) {
                netdev_err(bp->dev, "ring reservation/IRQ init failure rc: 
%d\n", rc);
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 46f3978..ae10ebd 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -926,6 +926,10 @@ static int bnxt_set_channels(struct net_device *dev,
                return rc;
        }
 
+       if (bnxt_get_nr_rss_ctxs(bp, req_rx_rings) !=
+           bnxt_get_nr_rss_ctxs(bp, bp->rx_nr_rings))
+               bp->dev->priv_flags &= ~IFF_RXFH_CONFIGURED;
+
        if (netif_running(dev)) {
                if (BNXT_PF(bp)) {
                        /* TODO CHIMP_FW: Send message to all VF's
@@ -1315,6 +1319,35 @@ static int bnxt_get_rxfh(struct net_device *dev, u32 
*indir, u8 *key,
        return 0;
 }
 
+static int bnxt_set_rxfh(struct net_device *dev, const u32 *indir,
+                        const u8 *key, const u8 hfunc)
+{
+       struct bnxt *bp = netdev_priv(dev);
+       int rc = 0;
+
+       if (hfunc && hfunc != ETH_RSS_HASH_TOP)
+               return -EOPNOTSUPP;
+
+       if (key)
+               return -EOPNOTSUPP;
+
+       if (indir) {
+               u32 i, pad, tbl_size = bnxt_get_rxfh_indir_size(dev);
+
+               for (i = 0; i < tbl_size; i++)
+                       bp->rss_indir_tbl[i] = indir[i];
+               pad = bp->rss_indir_tbl_entries - tbl_size;
+               if (pad)
+                       memset(&bp->rss_indir_tbl[i], 0, pad * sizeof(u16));
+       }
+
+       if (netif_running(bp->dev)) {
+               bnxt_close_nic(bp, false, false);
+               rc = bnxt_open_nic(bp, false, false);
+       }
+       return rc;
+}
+
 static void bnxt_get_drvinfo(struct net_device *dev,
                             struct ethtool_drvinfo *info)
 {
@@ -3621,6 +3654,7 @@ void bnxt_ethtool_free(struct bnxt *bp)
        .get_rxfh_indir_size    = bnxt_get_rxfh_indir_size,
        .get_rxfh_key_size      = bnxt_get_rxfh_key_size,
        .get_rxfh               = bnxt_get_rxfh,
+       .set_rxfh               = bnxt_set_rxfh,
        .flash_device           = bnxt_flash_device,
        .get_eeprom_len         = bnxt_get_eeprom_len,
        .get_eeprom             = bnxt_get_eeprom,
-- 
1.8.3.1