net/mlx5: share Rx queue indirection table code

[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 1602140..2068331 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -78,6 +78,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
        ring->bd_dma = txr->tx_desc_mapping;
        ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_tx_bd);
        ring->vmem = (void **)&txr->tx_buf_ring;
+       ring->fw_ring_id = INVALID_HW_RING_ID;
 
        cpr = rte_zmalloc_socket("bnxt_tx_ring",
                                 sizeof(struct bnxt_cp_ring_info),
@@ -98,6 +99,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
        ring->bd_dma = cpr->cp_desc_mapping;
        ring->vmem_size = 0;
        ring->vmem = NULL;
+       ring->fw_ring_id = INVALID_HW_RING_ID;
 
        return 0;
 }
@@ -111,7 +113,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        uint32_t outer_tpid_bd = 0;
        struct tx_bd_long *txbd;
        struct tx_bd_long_hi *txbd1 = NULL;
-       uint32_t vlan_tag_flags, cfa_action;
+       uint32_t vlan_tag_flags;
        bool long_bd = false;
        unsigned short nr_bds = 0;
        struct rte_mbuf *m_seg;
@@ -131,7 +133,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |
                                PKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |
                                PKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |
-                               PKT_TX_QINQ_PKT))
+                               PKT_TX_QINQ_PKT) ||
+            (BNXT_TRUFLOW_EN(txq->bp) &&
+             (txq->bp->tx_cfa_action || txq->vfr_tx_cfa_action)))
                long_bd = true;
 
        nr_bds = long_bd + tx_pkt->nb_segs;
@@ -184,7 +188,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        if (long_bd) {
                txbd->flags_type |= TX_BD_LONG_TYPE_TX_BD_LONG;
                vlan_tag_flags = 0;
-               cfa_action = 0;
+
                /* HW can accelerate only outer vlan in QinQ mode */
                if (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) {
                        vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |
@@ -212,7 +216,11 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                        &txr->tx_desc_ring[txr->tx_prod];
                txbd1->lflags = 0;
                txbd1->cfa_meta = vlan_tag_flags;
-               txbd1->cfa_action = cfa_action;
+
+               if (txq->vfr_tx_cfa_action)
+                       txbd1->cfa_action = txq->vfr_tx_cfa_action;
+               else
+                       txbd1->cfa_action = txq->bp->tx_cfa_action;
 
                if (tx_pkt->ol_flags & PKT_TX_TCP_SEG) {
                        uint16_t hdr_size;