net/bnxt: refactor multi-queue Rx configuration

[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 f46b10c..45e0c3d 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -40,35 +40,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 
        bp->nr_vnics = 0;
 
-       /* Single queue mode */
-       if (bp->rx_cp_nr_rings < 2) {
-               vnic = &bp->vnic_info[0];
-               if (!vnic) {
-                       PMD_DRV_LOG(ERR, "VNIC alloc failed\n");
-                       rc = -ENOMEM;
-                       goto err_out;
-               }
-               vnic->flags |= BNXT_VNIC_INFO_BCAST;
-               bp->nr_vnics++;
-
-               rxq = bp->eth_dev->data->rx_queues[0];
-               rxq->vnic = vnic;
-
-               vnic->func_default = true;
-               vnic->start_grp_id = 0;
-               vnic->end_grp_id = vnic->start_grp_id;
-               filter = bnxt_alloc_filter(bp);
-               if (!filter) {
-                       PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
-                       rc = -ENOMEM;
-                       goto err_out;
-               }
-               filter->mac_index = 0;
-               filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
-               STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
-               goto out;
-       }
-
        /* Multi-queue mode */
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB_RSS) {
                /* VMDq ONLY, VMDq+RSS, VMDq+DCB, VMDq+DCB+RSS */
@@ -106,7 +77,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;
@@ -164,7 +134,8 @@ skip_filter_allocation:
                end_grp_id += nb_q_per_grp;
        }
 
-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;
 
@@ -212,6 +183,16 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq)
 
        sw_ring = rxq->rx_ring->rx_buf_ring;
        if (sw_ring) {
+#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
+               /*
+                * The vector receive burst function does not set used
+                * mbuf pointers to NULL, do that here to simplify
+                * cleanup logic.
+                */
+               for (i = 0; i < rxq->rxrearm_nb; i++)
+                       sw_ring[rxq->rxrearm_start + i] = NULL;
+               rxq->rxrearm_nb = 0;
+#endif
                for (i = 0;
                     i < rxq->rx_ring->rx_ring_struct->ring_size; i++) {
                        if (sw_ring[i]) {