examples/ip_pipeline: use table library headers

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

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 9d88429..c7bc884 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -540,8 +540,10 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        int rc = 0;
        bool evt = false;
 
-       /* If Rx Q was stopped return */
-       if (rxq->rx_deferred_start)
+       /* If Rx Q was stopped return. RxQ0 cannot be stopped. */
+       if (unlikely(((rxq->rx_deferred_start ||
+                      !rte_spinlock_trylock(&rxq->lock)) &&
+                     rxq->queue_id)))
                return 0;
 
        /* Handle RX burst request */
@@ -572,18 +574,20 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                raw_cons = NEXT_RAW_CMP(raw_cons);
                if (nb_rx_pkts == nb_pkts || evt)
                        break;
+               /* Post some Rx buf early in case of larger burst processing */
+               if (nb_rx_pkts == BNXT_RX_POST_THRESH)
+                       B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
        }
 
        cpr->cp_raw_cons = raw_cons;
-       if ((prod == rxr->rx_prod && ag_prod == rxr->ag_prod) && !evt) {
+       if (!nb_rx_pkts && !evt) {
                /*
                 * For PMD, there is no need to keep on pushing to REARM
                 * the doorbell if there are no new completions
                 */
-               return nb_rx_pkts;
+               goto done;
        }
 
-       B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
        if (prod != rxr->rx_prod)
                B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
 
@@ -591,6 +595,8 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        if (ag_prod != rxr->ag_prod)
                B_RX_DB(rxr->ag_doorbell, rxr->ag_prod);
 
+       B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
+
        /* Attempt to alloc Rx buf in case of a previous allocation failure. */
        if (rc == -ENOMEM) {
                int i;
@@ -614,16 +620,22 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                }
        }
 
+done:
+       rte_spinlock_unlock(&rxq->lock);
+
        return nb_rx_pkts;
 }
 
 void bnxt_free_rx_rings(struct bnxt *bp)
 {
        int i;
+       struct bnxt_rx_queue *rxq;
 
-       for (i = 0; i < (int)bp->rx_nr_rings; i++) {
-               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+       if (!bp->rx_queues)
+               return;
 
+       for (i = 0; i < (int)bp->rx_nr_rings; i++) {
+               rxq = bp->rx_queues[i];
                if (!rxq)
                        continue;