net/bnxt: fix queue start/stop operations

[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 4bc3204..c7bc884 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -46,8 +46,9 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
        }
 
        rx_buf->mbuf = mbuf;
+       mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 
-       rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
+       rxbd->address = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        return 0;
 }
@@ -73,8 +74,9 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
 
 
        rx_buf->mbuf = mbuf;
+       mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 
-       rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
+       rxbd->address = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        return 0;
 }
@@ -95,7 +97,7 @@ static inline void bnxt_reuse_rx_mbuf(struct bnxt_rx_ring_info *rxr,
 
        prod_bd = &rxr->rx_desc_ring[prod];
 
-       prod_bd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
+       prod_bd->address = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        rxr->rx_prod = prod;
 }
@@ -115,7 +117,7 @@ static void bnxt_reuse_ag_mbuf(struct bnxt_rx_ring_info *rxr, uint16_t cons,
        prod_bd = &rxr->ag_desc_ring[prod];
        cons_bd = &rxr->ag_desc_ring[cons];
 
-       prod_bd->addr = cons_bd->addr;
+       prod_bd->address = cons_bd->addr;
 }
 #endif
 
@@ -462,11 +464,15 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 
        if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
                mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       else if (likely(RX_CMP_IP_CS_UNKNOWN(rxcmp1)))
+               mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
        else
                mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
 
        if (likely(RX_CMP_L4_CS_OK(rxcmp1)))
                mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+       else if (likely(RX_CMP_L4_CS_UNKNOWN(rxcmp1)))
+               mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
        else
                mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
 
@@ -532,9 +538,12 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        uint16_t prod = rxr->rx_prod;
        uint16_t ag_prod = rxr->ag_prod;
        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 */
@@ -556,25 +565,37 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                nb_rx_pkts++;
                        if (rc == -EBUSY)       /* partial completion */
                                break;
+               } else {
+                       evt =
+                       bnxt_event_hwrm_resp_handler(rxq->bp,
+                                                    (struct cmpl_base *)rxcmp);
                }
+
                raw_cons = NEXT_RAW_CMP(raw_cons);
-               if (nb_rx_pkts == nb_pkts)
+               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) {
+       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);
-       B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
+       if (prod != rxr->rx_prod)
+               B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
+
        /* Ring the AGG ring DB */
-       B_RX_DB(rxr->ag_doorbell, rxr->ag_prod);
+       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) {
@@ -599,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;