net/bnxt: update HWRM structures

[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 7851414..53a9b52 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2018 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -106,7 +106,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 
        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",
                    pools, nb_q_per_grp);
        start_grp_id = 0;
@@ -165,6 +164,8 @@ skip_filter_allocation:
        }
 
 out:
+       bp->rx_num_qs_per_vnic = nb_q_per_grp;
+
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
                struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf;
 
@@ -210,8 +211,6 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq)
        if (!rxq || !rxq->rx_ring)
                return;
 
-       rte_spinlock_lock(&rxq->lock);
-
        sw_ring = rxq->rx_ring->rx_buf_ring;
        if (sw_ring) {
                for (i = 0;
@@ -248,7 +247,6 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq)
                }
        }
 
-       rte_spinlock_unlock(&rxq->lock);
 }
 
 void bnxt_free_rx_mbufs(struct bnxt *bp)
@@ -314,7 +312,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        if (rc)
                return rc;
 
-       if (queue_idx >= BNXT_MAX_RINGS(bp)) {
+       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);
@@ -367,8 +365,9 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
 
        eth_dev->data->rx_queues[queue_idx] = rxq;
        /* Allocate RX ring hardware descriptors */
-       if (bnxt_alloc_rings(bp, queue_idx, NULL, rxq, rxq->cp_ring, NULL,
-                            "rxr")) {
+       rc = bnxt_alloc_rings(bp, queue_idx, NULL, rxq, rxq->cp_ring, NULL,
+                            "rxr");
+       if (rc) {
                PMD_DRV_LOG(ERR,
                            "ring_dma_zone_reserve for rx_ring failed!\n");
                goto err;
@@ -389,7 +388,6 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
                rxq->rx_started = true;
        }
        eth_dev->data->rx_queue_state[queue_idx] = queue_state;
-       rte_spinlock_init(&rxq->lock);
 
        /* Configure mtu if it is different from what was configured before */
        if (!queue_idx)
@@ -476,7 +474,7 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        if (rc)
                return rc;
 
-       if (BNXT_CHIP_THOR(bp)) {
+       if (BNXT_CHIP_P5(bp)) {
                /* Reconfigure default receive ring and MRU. */
                bnxt_hwrm_vnic_cfg(bp, rxq->vnic);
        }
@@ -561,12 +559,12 @@ 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++;
+       /* 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++;
 
+       if (BNXT_CHIP_P5(bp)) {
                /*
                 * For Thor, we need to ensure that the VNIC default receive
                 * ring corresponds to an active receive queue. When no queue
@@ -586,6 +584,22 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
                        /* Reconfigure default receive ring. */
                        bnxt_hwrm_vnic_cfg(bp, vnic);
                }
+       } else if (active_queue_cnt) {
+               /*
+                * If the queue being stopped is the current default queue and
+                * there are other active queues, pick one of them as the
+                * default and reconfigure the vnic.
+                */
+               if (vnic->dflt_ring_grp == bp->grp_info[rx_queue_id].fw_grp_id) {
+                       for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) {
+                               if (bp->rx_queues[i]->rx_started) {
+                                       vnic->dflt_ring_grp =
+                                               bp->grp_info[i].fw_grp_id;
+                                       bnxt_hwrm_vnic_cfg(bp, vnic);
+                                       break;
+                               }
+                       }
+               }
        }
 
        if (rc == 0)