net/bnxt: fix build with extra cflags

[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 4bb177f..c7a2de6 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -9,7 +9,6 @@
 #include <rte_malloc.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
 #include "bnxt_txr.h"
@@ -109,9 +108,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                struct tx_bd_long **last_txbd)
 {
        struct bnxt_tx_ring_info *txr = txq->tx_ring;
+       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;
@@ -123,11 +123,17 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                TX_BD_LONG_FLAGS_LHINT_LT2K
        };
 
+       if (unlikely(is_bnxt_in_error(txq->bp)))
+               return -EIO;
+
        if (tx_pkt->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM |
                                PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |
                                PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |
                                PKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |
-                               PKT_TX_TUNNEL_GENEVE))
+                               PKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |
+                               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;
@@ -180,8 +186,15 @@ 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;
-               if (tx_buf->mbuf->ol_flags & PKT_TX_VLAN_PKT) {
+
+               /* 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 |
+                               tx_buf->mbuf->vlan_tci_outer;
+                       outer_tpid_bd = txq->bp->outer_tpid_bd &
+                               BNXT_OUTER_TPID_BD_MASK;
+                       vlan_tag_flags |= outer_tpid_bd;
+               } else if (tx_buf->mbuf->ol_flags & PKT_TX_VLAN_PKT) {
                        /* shurd: Should this mask at
                         * TX_BD_LONG_CFA_META_VLAN_VID_MASK?
                         */
@@ -201,7 +214,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;
@@ -210,8 +227,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.
                         */
@@ -294,6 +313,11 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                        /* IP CSO */
                        txbd1->lflags |= TX_BD_LONG_LFLAGS_T_IP_CHKSUM;
                        txbd1->mss = 0;
+               } else if ((tx_pkt->ol_flags & PKT_TX_IEEE1588_TMST) ==
+                          PKT_TX_IEEE1588_TMST) {
+                       /* PTP */
+                       txbd1->lflags |= TX_BD_LONG_LFLAGS_STAMP;
+                       txbd1->mss = 0;
                }
        } else {
                txbd->flags_type |= TX_BD_SHORT_TYPE_TX_BD_SHORT;
@@ -434,7 +458,7 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        bnxt_handle_tx_cp(txq);
 
        /* Tx queue was stopped; wait for it to be restarted */
-       if (txq->tx_deferred_start) {
+       if (unlikely(!txq->tx_started)) {
                PMD_DRV_LOG(DEBUG, "Tx q stopped;return\n");
                return 0;
        }
@@ -458,13 +482,32 @@ uint16_t bnxt_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        return nb_tx_pkts;
 }
 
+/*
+ * Dummy DPDK callback for TX.
+ *
+ * This function is used to temporarily replace the real callback during
+ * unsafe control operations on the queue, or in case of error.
+ */
+uint16_t
+bnxt_dummy_xmit_pkts(void *tx_queue __rte_unused,
+                    struct rte_mbuf **tx_pkts __rte_unused,
+                    uint16_t nb_pkts __rte_unused)
+{
+       return 0;
+}
+
 int bnxt_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
        struct bnxt *bp = dev->data->dev_private;
        struct bnxt_tx_queue *txq = bp->tx_queues[tx_queue_id];
+       int rc = 0;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
-       txq->tx_deferred_start = false;
+       txq->tx_started = true;
        PMD_DRV_LOG(DEBUG, "Tx queue started\n");
 
        return 0;
@@ -474,12 +517,17 @@ int bnxt_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 {
        struct bnxt *bp = dev->data->dev_private;
        struct bnxt_tx_queue *txq = bp->tx_queues[tx_queue_id];
+       int rc = 0;
+
+       rc = is_bnxt_in_error(bp);
+       if (rc)
+               return rc;
 
        /* Handle TX completions */
        bnxt_handle_tx_cp(txq);
 
        dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
-       txq->tx_deferred_start = true;
+       txq->tx_started = false;
        PMD_DRV_LOG(DEBUG, "Tx queue stopped\n");
 
        return 0;