net/bnxt: fix Rx checksum flags

[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 d68d26f..b384b6e 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -65,17 +65,17 @@ static inline int bnxt_alloc_rx_data(struct bnxt_rx_queue *rxq,
 {
        struct rx_prod_pkt_bd *rxbd = &rxr->rx_desc_ring[prod];
        struct bnxt_sw_rx_bd *rx_buf = &rxr->rx_buf_ring[prod];
-       struct rte_mbuf *data;
+       struct rte_mbuf *mbuf;
 
-       data = __bnxt_alloc_rx_data(rxq->mb_pool);
-       if (!data) {
+       mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+       if (!mbuf) {
                rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
                return -ENOMEM;
        }
 
-       rx_buf->mbuf = data;
+       rx_buf->mbuf = mbuf;
 
-       rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
+       rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        return 0;
 }
@@ -86,23 +86,23 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
 {
        struct rx_prod_pkt_bd *rxbd = &rxr->ag_desc_ring[prod];
        struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
-       struct rte_mbuf *data;
+       struct rte_mbuf *mbuf;
 
-       data = __bnxt_alloc_rx_data(rxq->mb_pool);
-       if (!data) {
+       mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
+       if (!mbuf) {
                rte_atomic64_inc(&rxq->bp->rx_mbuf_alloc_fail);
                return -ENOMEM;
        }
 
        if (rxbd == NULL)
-               RTE_LOG(ERR, PMD, "Jumbo Frame. rxbd is NULL\n");
+               PMD_DRV_LOG(ERR, "Jumbo Frame. rxbd is NULL\n");
        if (rx_buf == NULL)
-               RTE_LOG(ERR, PMD, "Jumbo Frame. rx_buf is NULL\n");
+               PMD_DRV_LOG(ERR, "Jumbo Frame. rx_buf is NULL\n");
 
 
-       rx_buf->mbuf = data;
+       rx_buf->mbuf = mbuf;
 
-       rxbd->addr = rte_cpu_to_le_64(RTE_MBUF_DATA_DMA_ADDR(rx_buf->mbuf));
+       rxbd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        return 0;
 }
@@ -123,7 +123,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_DMA_ADDR(mbuf));
+       prod_bd->addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mbuf));
 
        rxr->rx_prod = prod;
 }
@@ -199,7 +199,7 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
        if (tpa_start1->flags2 &
            rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_META_FORMAT_VLAN)) {
                mbuf->vlan_tci = rte_le_to_cpu_32(tpa_start1->metadata);
-               mbuf->ol_flags |= PKT_RX_VLAN_PKT;
+               mbuf->ol_flags |= PKT_RX_VLAN;
        }
        if (likely(tpa_start1->flags2 &
                   rte_cpu_to_le_32(RX_TPA_START_CMPL_FLAGS2_L4_CS_CALC)))
@@ -234,7 +234,7 @@ static int bnxt_prod_ag_mbuf(struct bnxt_rx_queue *rxq)
        /* TODO batch allocation for better performance */
        while (rte_bitmap_get(rxr->ag_bitmap, next)) {
                if (unlikely(bnxt_alloc_ag_data(rxq, rxr, next))) {
-                       RTE_LOG(ERR, PMD,
+                       PMD_DRV_LOG(ERR,
                                "agg mbuf alloc failed: prod=0x%x\n", next);
                        break;
                }
@@ -442,6 +442,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 
        rte_prefetch0(mbuf);
 
+       mbuf->data_off = RTE_PKTMBUF_HEADROOM;
        mbuf->nb_segs = 1;
        mbuf->next = NULL;
        mbuf->pkt_len = rxcmp->len;
@@ -456,6 +457,10 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
                mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
        }
 
+       if ((rxcmp->flags_type & rte_cpu_to_le_16(RX_PKT_CMPL_FLAGS_MASK)) ==
+            RX_PKT_CMPL_FLAGS_ITYPE_PTP_W_TIMESTAMP)
+               mbuf->ol_flags |= PKT_RX_IEEE1588_PTP | PKT_RX_IEEE1588_TMST;
+
        if (agg_buf)
                bnxt_rx_pages(rxq, mbuf, &tmp_raw_cons, agg_buf);
 
@@ -464,18 +469,18 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
                        (RX_PKT_CMPL_METADATA_VID_MASK |
                        RX_PKT_CMPL_METADATA_DE |
                        RX_PKT_CMPL_METADATA_PRI_MASK);
-               mbuf->ol_flags |= PKT_RX_VLAN_PKT;
+               mbuf->ol_flags |= PKT_RX_VLAN;
        }
 
        if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
                mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
        else
-               mbuf->ol_flags |= PKT_RX_IP_CKSUM_NONE;
+               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
-               mbuf->ol_flags |= PKT_RX_L4_CKSUM_NONE;
+               mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
 
        mbuf->packet_type = bnxt_parse_pkt_type(rxcmp, rxcmp1);
 
@@ -507,7 +512,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
         */
        prod = RING_NEXT(rxr->rx_ring_struct, prod);
        if (bnxt_alloc_rx_data(rxq, rxr, prod)) {
-               RTE_LOG(ERR, PMD, "mbuf alloc failed with prod=0x%x\n", prod);
+               PMD_DRV_LOG(ERR, "mbuf alloc failed with prod=0x%x\n", prod);
                rc = -ENOMEM;
                goto rx;
        }
@@ -540,6 +545,10 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        uint16_t ag_prod = rxr->ag_prod;
        int rc = 0;
 
+       /* If Rx Q was stopped return */
+       if (rxq->rx_deferred_start)
+               return 0;
+
        /* Handle RX burst request */
        while (1) {
                cons = RING_CMP(cpr->cp_ring_struct, raw_cons);
@@ -596,7 +605,7 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                rxr->rx_prod = i;
                                B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
                        } else {
-                               RTE_LOG(ERR, PMD, "Alloc  mbuf failed\n");
+                               PMD_DRV_LOG(ERR, "Alloc  mbuf failed\n");
                                break;
                        }
                }
@@ -739,7 +748,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
        prod = rxr->rx_prod;
        for (i = 0; i < ring->ring_size; i++) {
                if (bnxt_alloc_rx_data(rxq, rxr, prod) != 0) {
-                       RTE_LOG(WARNING, PMD,
+                       PMD_DRV_LOG(WARNING,
                                "init'ed rx ring %d with %d/%d mbufs only\n",
                                rxq->queue_id, i, ring->ring_size);
                        break;
@@ -747,7 +756,6 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
                rxr->rx_prod = prod;
                prod = RING_NEXT(rxr->rx_ring_struct, prod);
        }
-       RTE_LOG(DEBUG, PMD, "%s\n", __func__);
 
        ring = rxr->ag_ring_struct;
        type = RX_PROD_AGG_BD_TYPE_RX_PROD_AGG;
@@ -756,7 +764,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
 
        for (i = 0; i < ring->ring_size; i++) {
                if (bnxt_alloc_ag_data(rxq, rxr, prod) != 0) {
-                       RTE_LOG(WARNING, PMD,
+                       PMD_DRV_LOG(WARNING,
                        "init'ed AG ring %d with %d/%d mbufs only\n",
                        rxq->queue_id, i, ring->ring_size);
                        break;
@@ -764,7 +772,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
                rxr->ag_prod = prod;
                prod = RING_NEXT(rxr->ag_ring_struct, prod);
        }
-       RTE_LOG(DEBUG, PMD, "%s AGG Done!\n", __func__);
+       PMD_DRV_LOG(DEBUG, "AGG Done!\n");
 
        if (rxr->tpa_info) {
                for (i = 0; i < BNXT_TPA_MAX; i++) {
@@ -776,7 +784,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
                        }
                }
        }
-       RTE_LOG(DEBUG, PMD, "%s TPA alloc Done!\n", __func__);
+       PMD_DRV_LOG(DEBUG, "TPA alloc Done!\n");
 
        return 0;
 }