net/bnxt: disable vector mode Tx with VLAN offload

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

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 9de12e0..c71e6f1 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -57,6 +57,7 @@ int bnxt_init_one_tx_ring(struct bnxt_tx_queue *txq)
 int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
 {
        struct bnxt_cp_ring_info *cpr;
+       struct bnxt_cp_ring_info *nqr;
        struct bnxt_tx_ring_info *txr;
        struct bnxt_ring *ring;
 
@@ -100,22 +101,31 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
        ring->vmem_size = 0;
        ring->vmem = NULL;
 
-       return 0;
-}
+       if (BNXT_HAS_NQ(txq->bp)) {
+               nqr = rte_zmalloc_socket("bnxt_tx_ring_nq",
+                                        sizeof(struct bnxt_cp_ring_info),
+                                        RTE_CACHE_LINE_SIZE, socket_id);
+               if (nqr == NULL)
+                       return -ENOMEM;
 
-static inline uint32_t bnxt_tx_bds_in_hw(struct bnxt_tx_queue *txq)
-{
-       return ((txq->tx_ring->tx_prod - txq->tx_ring->tx_cons) &
-               txq->tx_ring->tx_ring_struct->ring_mask);
-}
+               txq->nq_ring = nqr;
 
-static inline uint32_t bnxt_tx_avail(struct bnxt_tx_queue *txq)
-{
-       /* Tell compiler to fetch tx indices from memory. */
-       rte_compiler_barrier();
+               ring = rte_zmalloc_socket("bnxt_tx_ring_struct",
+                                         sizeof(struct bnxt_ring),
+                                         RTE_CACHE_LINE_SIZE, socket_id);
+               if (ring == NULL)
+                       return -ENOMEM;
 
-       return ((txq->tx_ring->tx_ring_struct->ring_size -
-                bnxt_tx_bds_in_hw(txq)) - 1);
+               nqr->cp_ring_struct = ring;
+               ring->ring_size = txr->tx_ring_struct->ring_size;
+               ring->ring_mask = ring->ring_size - 1;
+               ring->bd = (void *)nqr->cp_desc_ring;
+               ring->bd_dma = nqr->cp_desc_mapping;
+               ring->vmem_size = 0;
+               ring->vmem = NULL;
+       }
+
+       return 0;
 }
 
 static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
@@ -225,8 +235,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                        txbd1->lflags |= TX_BD_LONG_LFLAGS_LSO |
                                         TX_BD_LONG_LFLAGS_T_IPID;
                        hdr_size = tx_pkt->l2_len + tx_pkt->l3_len +
-                                       tx_pkt->l4_len + tx_pkt->outer_l2_len +
-                                       tx_pkt->outer_l3_len;
+                                       tx_pkt->l4_len;
+                       hdr_size += (tx_pkt->ol_flags & PKT_TX_TUNNEL_MASK) ?
+                                   tx_pkt->outer_l2_len +
+                                   tx_pkt->outer_l3_len : 0;
                        /* The hdr_size is multiple of 16bit units not 8bit.
                         * Hence divide by 2.
                         */
@@ -430,7 +442,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq)
        if (nb_tx_pkts) {
                bnxt_tx_cmp(txq, nb_tx_pkts);
                cpr->cp_raw_cons = raw_cons;
-               B_CP_DB(cpr, cpr->cp_raw_cons, ring_mask);
+               bnxt_db_cq(cpr);
        }
 
        return nb_tx_pkts;
@@ -467,7 +479,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        if (likely(nb_tx_pkts)) {
                /* Request a completion on the last packet */
                last_txbd->flags_type &= ~TX_BD_LONG_FLAGS_NO_CMPL;
-               B_TX_DB(txq->tx_ring->tx_doorbell, txq->tx_ring->tx_prod);
+               bnxt_db_write(&txq->tx_ring->tx_db, txq->tx_ring->tx_prod);
        }
 
        return nb_tx_pkts;
@@ -475,7 +487,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 int bnxt_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
-       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       struct bnxt *bp = dev->data->dev_private;
        struct bnxt_tx_queue *txq = bp->tx_queues[tx_queue_id];
 
        dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
@@ -487,7 +499,7 @@ int bnxt_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 
 int bnxt_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
-       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       struct bnxt *bp = dev->data->dev_private;
        struct bnxt_tx_queue *txq = bp->tx_queues[tx_queue_id];
 
        /* Handle TX completions */