net/bnxt: fix using RSS config struct

[dpdk.git] / drivers / net / bnxt / bnxt_rxq.c

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index e82eda9..e42308a 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -35,7 +35,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
        int start_grp_id, end_grp_id = 1, rc = 0;
        struct bnxt_vnic_info *vnic;
        struct bnxt_filter_info *filter;
-       enum rte_eth_nb_pools pools = bp->rx_cp_nr_rings, max_pools = 0;
+       enum rte_eth_nb_pools pools = 1, max_pools = 0;
        struct bnxt_rx_queue *rxq;
 
        bp->nr_vnics = 0;
@@ -100,7 +100,11 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
                        rc = -EINVAL;
                        goto err_out;
                }
+       } else if (!dev_conf->rxmode.mq_mode) {
+               pools = bp->rx_cosq_cnt ? bp->rx_cosq_cnt : pools;
        }
+
+       pools = RTE_MIN(pools, bp->rx_cp_nr_rings);
        nb_q_per_grp = bp->rx_cp_nr_rings / pools;
        bp->rx_num_qs_per_vnic = nb_q_per_grp;
        PMD_DRV_LOG(DEBUG, "pools = %u nb_q_per_grp = %u\n",
@@ -164,10 +168,8 @@ out:
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
                struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf;
 
-               if (bp->flags & BNXT_FLAG_UPDATE_HASH) {
-                       rss = &bp->rss_conf;
+               if (bp->flags & BNXT_FLAG_UPDATE_HASH)
                        bp->flags &= ~BNXT_FLAG_UPDATE_HASH;
-               }
 
                for (i = 0; i < bp->nr_vnics; i++) {
                        vnic = &bp->vnic_info[i];
@@ -296,7 +298,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        if (rc)
                return rc;
 
-       if (queue_idx >= bp->max_rx_rings) {
+       if (queue_idx >= BNXT_MAX_RINGS(bp)) {
                PMD_DRV_LOG(ERR,
                        "Cannot create Rx ring %d. Only %d rings available\n",
                        queue_idx, bp->max_rx_rings);
@@ -451,6 +453,10 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        if (rc)
                return rc;
 
+       if (BNXT_CHIP_THOR(bp)) {
+               /* Reconfigure default receive ring and MRU. */
+               bnxt_hwrm_vnic_cfg(bp, rxq->vnic);
+       }
        PMD_DRV_LOG(INFO, "Rx queue started %d\n", rx_queue_id);
 
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
@@ -491,7 +497,8 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
        struct bnxt_vnic_info *vnic = NULL;
        struct bnxt_rx_queue *rxq = NULL;
-       int rc = 0;
+       int active_queue_cnt = 0;
+       int i, rc = 0;
 
        rc = is_bnxt_in_error(bp);
        if (rc)
@@ -507,18 +514,23 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        }
 
        rxq = bp->rx_queues[rx_queue_id];
-
-       if (rxq == NULL) {
+       if (!rxq) {
                PMD_DRV_LOG(ERR, "Invalid Rx queue %d\n", rx_queue_id);
                return -EINVAL;
        }
 
+       vnic = rxq->vnic;
+       if (!vnic) {
+               PMD_DRV_LOG(ERR, "VNIC not initialized for RxQ %d\n",
+                           rx_queue_id);
+               return -EINVAL;
+       }
+
        dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
        rxq->rx_started = false;
        PMD_DRV_LOG(DEBUG, "Rx queue stopped\n");
 
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
-               vnic = rxq->vnic;
                if (BNXT_HAS_RING_GRPS(bp))
                        vnic->fw_grp_ids[rx_queue_id] = INVALID_HW_RING_ID;
 
@@ -526,6 +538,33 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
                rc = bnxt_vnic_rss_configure(bp, vnic);
        }
 
+       if (BNXT_CHIP_THOR(bp)) {
+               /* Compute current number of active receive queues. */
+               for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++)
+                       if (bp->rx_queues[i]->rx_started)
+                               active_queue_cnt++;
+
+               /*
+                * For Thor, we need to ensure that the VNIC default receive
+                * ring corresponds to an active receive queue. When no queue
+                * is active, we need to temporarily set the MRU to zero so
+                * that packets are dropped early in the receive pipeline in
+                * order to prevent the VNIC default receive ring from being
+                * accessed.
+                */
+               if (active_queue_cnt == 0) {
+                       uint16_t saved_mru = vnic->mru;
+
+                       vnic->mru = 0;
+                       /* Reconfigure default receive ring and MRU. */
+                       bnxt_hwrm_vnic_cfg(bp, vnic);
+                       vnic->mru = saved_mru;
+               } else {
+                       /* Reconfigure default receive ring. */
+                       bnxt_hwrm_vnic_cfg(bp, vnic);
+               }
+       }
+
        if (rc == 0)
                bnxt_rx_queue_release_mbufs(rxq);