net/bnxt: limit queue count for NS3/Stingray devices

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

diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c
index b9b975e..2d7645e 100644 (file)
--- a/drivers/net/bnxt/bnxt_txq.c
+++ b/drivers/net/bnxt/bnxt_txq.c
@@ -8,7 +8,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
@@ -35,7 +34,7 @@ static void bnxt_tx_queue_release_mbufs(struct bnxt_tx_queue *txq)
        if (sw_ring) {
                for (i = 0; i < txq->tx_ring->tx_ring_struct->ring_size; i++) {
                        if (sw_ring[i].mbuf) {
-                               rte_pktmbuf_free(sw_ring[i].mbuf);
+                               rte_pktmbuf_free_seg(sw_ring[i].mbuf);
                                sw_ring[i].mbuf = NULL;
                        }
                }
@@ -58,6 +57,9 @@ void bnxt_tx_queue_release_op(void *tx_queue)
        struct bnxt_tx_queue *txq = (struct bnxt_tx_queue *)tx_queue;
 
        if (txq) {
+               if (is_bnxt_in_error(txq->bp))
+                       return;
+
                /* Free TX ring hardware descriptors */
                bnxt_tx_queue_release_mbufs(txq);
                bnxt_free_ring(txq->tx_ring->tx_ring_struct);
@@ -69,6 +71,7 @@ void bnxt_tx_queue_release_op(void *tx_queue)
                rte_memzone_free(txq->mz);
                txq->mz = NULL;
 
+               rte_free(txq->free);
                rte_free(txq);
        }
 }
@@ -79,11 +82,15 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
                               unsigned int socket_id,
                               const struct rte_eth_txconf *tx_conf)
 {
-       struct bnxt *bp = (struct bnxt *)eth_dev->data->dev_private;
+       struct bnxt *bp = eth_dev->data->dev_private;
        struct bnxt_tx_queue *txq;
        int rc = 0;
 
-       if (queue_idx >= bp->max_tx_rings) {
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
+
+       if (queue_idx >= BNXT_MAX_RINGS(bp)) {
                PMD_DRV_LOG(ERR,
                        "Cannot create Tx ring %d. Only %d rings available\n",
                        queue_idx, bp->max_tx_rings);
@@ -110,9 +117,20 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
                rc = -ENOMEM;
                goto out;
        }
+
+       txq->free = rte_zmalloc_socket(NULL,
+                                      sizeof(struct rte_mbuf *) * nb_desc,
+                                      RTE_CACHE_LINE_SIZE, socket_id);
+       if (!txq->free) {
+               PMD_DRV_LOG(ERR, "allocation of tx mbuf free array failed!");
+               rte_free(txq);
+               rc = -ENOMEM;
+               goto out;
+       }
        txq->bp = bp;
        txq->nb_tx_desc = nb_desc;
        txq->tx_free_thresh = tx_conf->tx_free_thresh;
+       txq->tx_deferred_start = tx_conf->tx_deferred_start;
 
        rc = bnxt_init_tx_ring_struct(txq, socket_id);
        if (rc)
@@ -122,8 +140,8 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
        txq->port_id = eth_dev->data->port_id;
 
        /* Allocate TX ring hardware descriptors */
-       if (bnxt_alloc_rings(bp, queue_idx, txq, NULL, txq->cp_ring,
-                       "txr")) {
+       if (bnxt_alloc_rings(bp, queue_idx, txq, NULL, txq->cp_ring, NULL,
+                            "txr")) {
                PMD_DRV_LOG(ERR, "ring_dma_zone_reserve for tx_ring failed!");
                bnxt_tx_queue_release_op(txq);
                rc = -ENOMEM;
@@ -139,6 +157,10 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
 
        eth_dev->data->tx_queues[queue_idx] = txq;
 
+       if (txq->tx_deferred_start)
+               txq->tx_started = false;
+       else
+               txq->tx_started = true;
 out:
        return rc;
 }