Imported Upstream version 17.05
[deb_dpdk.git] / drivers / net / qede / qede_rxtx.c
index a34b665..baea1bb 100644 (file)
@@ -6,10 +6,9 @@
  * See LICENSE.qede_pmd for copyright and licensing details.
  */
 
+#include <rte_net.h>
 #include "qede_rxtx.h"
 
-static bool gro_disable = 1;   /* mod_param */
-
 static inline int qede_alloc_rx_buffer(struct qede_rx_queue *rxq)
 {
        struct rte_mbuf *new_mb = NULL;
@@ -69,7 +68,7 @@ static void qede_tx_queue_release_mbufs(struct qede_tx_queue *txq)
 {
        unsigned int i;
 
-       PMD_TX_LOG(DEBUG, txq, "releasing %u mbufs\n", txq->nb_tx_desc);
+       PMD_TX_LOG(DEBUG, txq, "releasing %u mbufs", txq->nb_tx_desc);
 
        if (txq->sw_tx_ring) {
                for (i = 0; i < txq->nb_tx_desc; i++) {
@@ -84,16 +83,16 @@ static void qede_tx_queue_release_mbufs(struct qede_tx_queue *txq)
 int
 qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                    uint16_t nb_desc, unsigned int socket_id,
-                   const struct rte_eth_rxconf *rx_conf,
+                   __rte_unused const struct rte_eth_rxconf *rx_conf,
                    struct rte_mempool *mp)
 {
        struct qede_dev *qdev = dev->data->dev_private;
        struct ecore_dev *edev = &qdev->edev;
-       struct rte_eth_dev_data *eth_data = dev->data;
+       struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
        struct qede_rx_queue *rxq;
-       uint16_t pkt_len = (uint16_t)dev->data->dev_conf.rxmode.max_rx_pkt_len;
+       uint16_t max_rx_pkt_len;
+       uint16_t bufsz;
        size_t size;
-       uint16_t data_size;
        int rc;
        int i;
 
@@ -127,34 +126,27 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        rxq->nb_rx_desc = nb_desc;
        rxq->queue_id = queue_idx;
        rxq->port_id = dev->data->port_id;
-
-       /* Sanity check */
-       data_size = (uint16_t)rte_pktmbuf_data_room_size(mp) -
-                               RTE_PKTMBUF_HEADROOM;
-
-       if (pkt_len > data_size && !dev->data->scattered_rx) {
-               DP_ERR(edev, "MTU %u should not exceed dataroom %u\n",
-                      pkt_len, data_size);
-               rte_free(rxq);
-               return -EINVAL;
+       max_rx_pkt_len = (uint16_t)rxmode->max_rx_pkt_len;
+       qdev->mtu = max_rx_pkt_len;
+
+       /* Fix up RX buffer size */
+       bufsz = (uint16_t)rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM;
+       if ((rxmode->enable_scatter)                    ||
+           (max_rx_pkt_len + QEDE_ETH_OVERHEAD) > bufsz) {
+               if (!dev->data->scattered_rx) {
+                       DP_INFO(edev, "Forcing scatter-gather mode\n");
+                       dev->data->scattered_rx = 1;
+               }
        }
-
        if (dev->data->scattered_rx)
-               rxq->rx_buf_size = data_size;
+               rxq->rx_buf_size = bufsz + QEDE_ETH_OVERHEAD;
        else
-               rxq->rx_buf_size = pkt_len + QEDE_ETH_OVERHEAD;
+               rxq->rx_buf_size = qdev->mtu + QEDE_ETH_OVERHEAD;
+       /* Align to cache-line size if needed */
+       rxq->rx_buf_size = QEDE_CEIL_TO_CACHE_LINE_SIZE(rxq->rx_buf_size);
 
-       qdev->mtu = pkt_len;
-
-       DP_INFO(edev, "MTU = %u ; RX buffer = %u\n",
-               qdev->mtu, rxq->rx_buf_size);
-
-       if (pkt_len > ETHER_MAX_LEN) {
-               dev->data->dev_conf.rxmode.jumbo_frame = 1;
-               DP_NOTICE(edev, false, "jumbo frame enabled\n");
-       } else {
-               dev->data->dev_conf.rxmode.jumbo_frame = 0;
-       }
+       DP_INFO(edev, "mtu %u mbufsz %u bd_max_bytes %u scatter_mode %d\n",
+               qdev->mtu, bufsz, rxq->rx_buf_size, dev->data->scattered_rx);
 
        /* Allocate the parallel driver ring for Rx buffers */
        size = sizeof(*rxq->sw_rx_ring) * rxq->nb_rx_desc;
@@ -176,7 +168,8 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                                            ECORE_CHAIN_CNT_TYPE_U16,
                                            rxq->nb_rx_desc,
                                            sizeof(struct eth_rx_bd),
-                                           &rxq->rx_bd_ring);
+                                           &rxq->rx_bd_ring,
+                                           NULL);
 
        if (rc != ECORE_SUCCESS) {
                DP_NOTICE(edev, false,
@@ -196,7 +189,8 @@ qede_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                                            ECORE_CHAIN_CNT_TYPE_U16,
                                            rxq->nb_rx_desc,
                                            sizeof(union eth_rx_cqe),
-                                           &rxq->rx_comp_ring);
+                                           &rxq->rx_comp_ring,
+                                           NULL);
 
        if (rc != ECORE_SUCCESS) {
                DP_NOTICE(edev, false,
@@ -291,7 +285,8 @@ qede_tx_queue_setup(struct rte_eth_dev *dev,
                                            ECORE_CHAIN_CNT_TYPE_U16,
                                            txq->nb_tx_desc,
                                            sizeof(union eth_tx_bd_types),
-                                           &txq->tx_pbl);
+                                           &txq->tx_pbl,
+                                           NULL);
        if (rc != ECORE_SUCCESS) {
                DP_ERR(edev,
                       "Unable to allocate memory for txbd ring on socket %u",
@@ -335,8 +330,8 @@ qede_tx_queue_setup(struct rte_eth_dev *dev,
 static void qede_init_fp(struct qede_dev *qdev)
 {
        struct qede_fastpath *fp;
-       uint8_t i, rss_id, tc;
-       int fp_rx = qdev->fp_num_rx, rxq = 0, txq = 0;
+       uint8_t i;
+       int fp_rx = qdev->fp_num_rx;
 
        memset((void *)qdev->fp_array, 0, (QEDE_QUEUE_CNT(qdev) *
                                           sizeof(*qdev->fp_array)));
@@ -356,7 +351,6 @@ static void qede_init_fp(struct qede_dev *qdev)
                snprintf(fp->name, sizeof(fp->name), "%s-fp-%d", "qdev", i);
        }
 
-       qdev->gro_disable = gro_disable;
 }
 
 void qede_free_fp_arrays(struct qede_dev *qdev)
@@ -373,11 +367,9 @@ void qede_free_fp_arrays(struct qede_dev *qdev)
        }
 }
 
-int qede_alloc_fp_array(struct qede_dev *qdev)
+static int qede_alloc_fp_array(struct qede_dev *qdev)
 {
-       struct qede_fastpath *fp;
        struct ecore_dev *edev = &qdev->edev;
-       int i;
 
        qdev->fp_array = rte_calloc("fp", QEDE_QUEUE_CNT(qdev),
                                    sizeof(*qdev->fp_array),
@@ -483,7 +475,8 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
 }
 
 static inline void
-qede_update_rx_prod(struct qede_dev *edev, struct qede_rx_queue *rxq)
+qede_update_rx_prod(__rte_unused struct qede_dev *edev,
+                   struct qede_rx_queue *rxq)
 {
        uint16_t bd_prod = ecore_chain_get_prod_idx(&rxq->rx_bd_ring);
        uint16_t cqe_prod = ecore_chain_get_prod_idx(&rxq->rx_comp_ring);
@@ -510,104 +503,63 @@ qede_update_rx_prod(struct qede_dev *edev, struct qede_rx_queue *rxq)
         */
        rte_wmb();
 
-       PMD_RX_LOG(DEBUG, rxq, "bd_prod %u  cqe_prod %u\n", bd_prod, cqe_prod);
-}
-
-static inline uint32_t
-qede_rxfh_indir_default(uint32_t index, uint32_t n_rx_rings)
-{
-       return index % n_rx_rings;
-}
-
-static void qede_prandom_bytes(uint32_t *buff, size_t bytes)
-{
-       unsigned int i;
-
-       srand((unsigned int)time(NULL));
-
-       for (i = 0; i < ECORE_RSS_KEY_SIZE; i++)
-               buff[i] = rand();
+       PMD_RX_LOG(DEBUG, rxq, "bd_prod %u  cqe_prod %u", bd_prod, cqe_prod);
 }
 
-static bool
-qede_check_vport_rss_enable(struct rte_eth_dev *eth_dev,
-                           struct qed_update_vport_rss_params *rss_params)
+static void
+qede_update_sge_tpa_params(struct ecore_sge_tpa_params *sge_tpa_params,
+                          uint16_t mtu, bool enable)
 {
-       struct rte_eth_rss_conf rss_conf;
-       enum rte_eth_rx_mq_mode mode = eth_dev->data->dev_conf.rxmode.mq_mode;
-       struct qede_dev *qdev = eth_dev->data->dev_private;
-       struct ecore_dev *edev = &qdev->edev;
-       uint8_t rss_caps;
-       unsigned int i;
-       uint64_t hf;
-       uint32_t *key;
-
-       PMD_INIT_FUNC_TRACE(edev);
-
-       rss_conf = eth_dev->data->dev_conf.rx_adv_conf.rss_conf;
-       key = (uint32_t *)rss_conf.rss_key;
-       hf = rss_conf.rss_hf;
-
-       /* Check if RSS conditions are met.
-        * Note: Even though its meaningless to enable RSS with one queue, it
-        * could be used to produce RSS Hash, so skipping that check.
+       /* Enable LRO in split mode */
+       sge_tpa_params->tpa_ipv4_en_flg = enable;
+       sge_tpa_params->tpa_ipv6_en_flg = enable;
+       sge_tpa_params->tpa_ipv4_tunn_en_flg = false;
+       sge_tpa_params->tpa_ipv6_tunn_en_flg = false;
+       /* set if tpa enable changes */
+       sge_tpa_params->update_tpa_en_flg = 1;
+       /* set if tpa parameters should be handled */
+       sge_tpa_params->update_tpa_param_flg = enable;
+
+       sge_tpa_params->max_buffers_per_cqe = 20;
+       /* Enable TPA in split mode. In this mode each TPA segment
+        * starts on the new BD, so there is one BD per segment.
         */
-       if (!(mode & ETH_MQ_RX_RSS)) {
-               DP_INFO(edev, "RSS flag is not set\n");
-               return false;
-       }
-
-       if (hf == 0) {
-               DP_INFO(edev, "Request to disable RSS\n");
-               return false;
-       }
-
-       memset(rss_params, 0, sizeof(*rss_params));
-
-       for (i = 0; i < ECORE_RSS_IND_TABLE_SIZE; i++)
-               rss_params->rss_ind_table[i] = qede_rxfh_indir_default(i,
-                                                       QEDE_RSS_COUNT(qdev));
-
-       if (!key)
-               qede_prandom_bytes(rss_params->rss_key,
-                                  sizeof(rss_params->rss_key));
-       else
-               memcpy(rss_params->rss_key, rss_conf.rss_key,
-                      rss_conf.rss_key_len);
-
-       qede_init_rss_caps(&rss_caps, hf);
-
-       rss_params->rss_caps = rss_caps;
-
-       DP_INFO(edev, "RSS conditions are met\n");
-
-       return true;
+       sge_tpa_params->tpa_pkt_split_flg = 1;
+       sge_tpa_params->tpa_hdr_data_split_flg = 0;
+       sge_tpa_params->tpa_gro_consistent_flg = 0;
+       sge_tpa_params->tpa_max_aggs_num = ETH_TPA_MAX_AGGS_NUM;
+       sge_tpa_params->tpa_max_size = 0x7FFF;
+       sge_tpa_params->tpa_min_size_to_start = mtu / 2;
+       sge_tpa_params->tpa_min_size_to_cont = mtu / 2;
 }
 
-static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
+static int qede_start_queues(struct rte_eth_dev *eth_dev,
+                            __rte_unused bool clear_stats)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
        struct ecore_dev *edev = &qdev->edev;
        struct ecore_queue_start_common_params q_params;
-       struct qed_update_vport_rss_params *rss_params = &qdev->rss_params;
        struct qed_dev_info *qed_info = &qdev->dev_info.common;
        struct qed_update_vport_params vport_update_params;
+       struct ecore_sge_tpa_params tpa_params;
        struct qede_tx_queue *txq;
        struct qede_fastpath *fp;
        dma_addr_t p_phys_table;
        int txq_index;
        uint16_t page_cnt;
-       int vlan_removal_en = 1;
        int rc, tc, i;
 
        for_each_queue(i) {
                fp = &qdev->fp_array[i];
                if (fp->type & QEDE_FASTPATH_RX) {
-                       p_phys_table = ecore_chain_get_pbl_phys(&fp->rxq->
-                                                               rx_comp_ring);
-                       page_cnt = ecore_chain_get_page_cnt(&fp->rxq->
-                                                               rx_comp_ring);
+                       struct ecore_rxq_start_ret_params ret_params;
+
+                       p_phys_table =
+                           ecore_chain_get_pbl_phys(&fp->rxq->rx_comp_ring);
+                       page_cnt =
+                           ecore_chain_get_page_cnt(&fp->rxq->rx_comp_ring);
 
+                       memset(&ret_params, 0, sizeof(ret_params));
                        memset(&q_params, 0, sizeof(q_params));
                        q_params.queue_id = i;
                        q_params.vport_id = 0;
@@ -621,13 +573,17 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
                                           fp->rxq->rx_bd_ring.p_phys_addr,
                                           p_phys_table,
                                           page_cnt,
-                                          &fp->rxq->hw_rxq_prod_addr);
+                                          &ret_params);
                        if (rc) {
                                DP_ERR(edev, "Start rxq #%d failed %d\n",
                                       fp->rxq->queue_id, rc);
                                return rc;
                        }
 
+                       /* Use the return parameters */
+                       fp->rxq->hw_rxq_prod_addr = ret_params.p_prod;
+                       fp->rxq->handle = ret_params.p_handle;
+
                        fp->rxq->hw_cons_ptr =
                                        &fp->sb_info->sb_virt->pi_array[RX_PI];
 
@@ -637,6 +593,8 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
                if (!(fp->type & QEDE_FASTPATH_TX))
                        continue;
                for (tc = 0; tc < qdev->num_tc; tc++) {
+                       struct ecore_txq_start_ret_params ret_params;
+
                        txq = fp->txqs[tc];
                        txq_index = tc * QEDE_RSS_COUNT(qdev) + i;
 
@@ -644,6 +602,7 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
                        page_cnt = ecore_chain_get_page_cnt(&txq->tx_pbl);
 
                        memset(&q_params, 0, sizeof(q_params));
+                       memset(&ret_params, 0, sizeof(ret_params));
                        q_params.queue_id = txq->queue_id;
                        q_params.vport_id = 0;
                        q_params.sb = fp->sb_info->igu_sb_id;
@@ -652,13 +611,16 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
                        rc = qdev->ops->q_tx_start(edev, i, &q_params,
                                                   p_phys_table,
                                                   page_cnt, /* **pp_doorbell */
-                                                  &txq->doorbell_addr);
+                                                  &ret_params);
                        if (rc) {
                                DP_ERR(edev, "Start txq %u failed %d\n",
                                       txq_index, rc);
                                return rc;
                        }
 
+                       txq->doorbell_addr = ret_params.p_doorbell;
+                       txq->handle = ret_params.p_handle;
+
                        txq->hw_cons_ptr =
                            &fp->sb_info->sb_virt->pi_array[TX_PI(tc)];
                        SET_FIELD(txq->tx_db.data.params,
@@ -688,16 +650,14 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
                vport_update_params.tx_switching_flg = 1;
        }
 
-       if (qede_check_vport_rss_enable(eth_dev, rss_params)) {
-               vport_update_params.update_rss_flg = 1;
-               qdev->rss_enabled = 1;
-       } else {
-               qdev->rss_enabled = 0;
+       /* TPA */
+       if (qdev->enable_lro) {
+               DP_INFO(edev, "Enabling LRO\n");
+               memset(&tpa_params, 0, sizeof(struct ecore_sge_tpa_params));
+               qede_update_sge_tpa_params(&tpa_params, qdev->mtu, true);
+               vport_update_params.sge_tpa_params = &tpa_params;
        }
 
-       rte_memcpy(&vport_update_params.rss_params, rss_params,
-              sizeof(*rss_params));
-
        rc = qdev->ops->vport_update(edev, &vport_update_params);
        if (rc) {
                DP_ERR(edev, "Update V-PORT failed %d\n", rc);
@@ -707,79 +667,91 @@ static int qede_start_queues(struct rte_eth_dev *eth_dev, bool clear_stats)
        return 0;
 }
 
-#ifdef ENC_SUPPORTED
 static bool qede_tunn_exist(uint16_t flag)
 {
        return !!((PARSING_AND_ERR_FLAGS_TUNNELEXIST_MASK <<
                    PARSING_AND_ERR_FLAGS_TUNNELEXIST_SHIFT) & flag);
 }
 
-static inline uint8_t qede_check_tunn_csum(uint16_t flag)
+/*
+ * qede_check_tunn_csum_l4:
+ * Returns:
+ * 1 : If L4 csum is enabled AND if the validation has failed.
+ * 0 : Otherwise
+ */
+static inline uint8_t qede_check_tunn_csum_l4(uint16_t flag)
 {
-       uint8_t tcsum = 0;
-       uint16_t csum_flag = 0;
-
        if ((PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMWASCALCULATED_MASK <<
             PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMWASCALCULATED_SHIFT) & flag)
-               csum_flag |= PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_MASK <<
-                   PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_SHIFT;
-
-       if ((PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_MASK <<
-            PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_SHIFT) & flag) {
-               csum_flag |= PARSING_AND_ERR_FLAGS_L4CHKSMERROR_MASK <<
-                   PARSING_AND_ERR_FLAGS_L4CHKSMERROR_SHIFT;
-               tcsum = QEDE_TUNN_CSUM_UNNECESSARY;
-       }
-
-       csum_flag |= PARSING_AND_ERR_FLAGS_TUNNELIPHDRERROR_MASK <<
-           PARSING_AND_ERR_FLAGS_TUNNELIPHDRERROR_SHIFT |
-           PARSING_AND_ERR_FLAGS_IPHDRERROR_MASK <<
-           PARSING_AND_ERR_FLAGS_IPHDRERROR_SHIFT;
-
-       if (csum_flag & flag)
-               return QEDE_CSUM_ERROR;
+               return !!((PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_MASK <<
+                       PARSING_AND_ERR_FLAGS_TUNNELL4CHKSMERROR_SHIFT) & flag);
 
-       return QEDE_CSUM_UNNECESSARY | tcsum;
-}
-#else
-static inline uint8_t qede_tunn_exist(uint16_t flag)
-{
        return 0;
 }
 
-static inline uint8_t qede_check_tunn_csum(uint16_t flag)
+static inline uint8_t qede_check_notunn_csum_l4(uint16_t flag)
 {
+       if ((PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_MASK <<
+            PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_SHIFT) & flag)
+               return !!((PARSING_AND_ERR_FLAGS_L4CHKSMERROR_MASK <<
+                          PARSING_AND_ERR_FLAGS_L4CHKSMERROR_SHIFT) & flag);
+
        return 0;
 }
-#endif
 
-static inline uint8_t qede_check_notunn_csum(uint16_t flag)
+static inline uint32_t qede_rx_cqe_to_pkt_type(uint16_t flags)
 {
-       uint8_t csum = 0;
-       uint16_t csum_flag = 0;
-
-       if ((PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_MASK <<
-            PARSING_AND_ERR_FLAGS_L4CHKSMWASCALCULATED_SHIFT) & flag) {
-               csum_flag |= PARSING_AND_ERR_FLAGS_L4CHKSMERROR_MASK <<
-                   PARSING_AND_ERR_FLAGS_L4CHKSMERROR_SHIFT;
-               csum = QEDE_CSUM_UNNECESSARY;
-       }
-
-       csum_flag |= PARSING_AND_ERR_FLAGS_IPHDRERROR_MASK <<
-           PARSING_AND_ERR_FLAGS_IPHDRERROR_SHIFT;
-
-       if (csum_flag & flag)
-               return QEDE_CSUM_ERROR;
-
-       return csum;
+       uint16_t val;
+
+       /* Lookup table */
+       static const uint32_t
+       ptype_lkup_tbl[QEDE_PKT_TYPE_MAX] __rte_cache_aligned = {
+               [QEDE_PKT_TYPE_IPV4] = RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_IPV6] = RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_IPV4_TCP] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_TCP,
+               [QEDE_PKT_TYPE_IPV6_TCP] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP,
+               [QEDE_PKT_TYPE_IPV4_UDP] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_UDP,
+               [QEDE_PKT_TYPE_IPV6_UDP] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP,
+       };
+
+       /* Bits (0..3) provides L3/L4 protocol type */
+       val = ((PARSING_AND_ERR_FLAGS_L3TYPE_MASK <<
+              PARSING_AND_ERR_FLAGS_L3TYPE_SHIFT) |
+              (PARSING_AND_ERR_FLAGS_L4PROTOCOL_MASK <<
+               PARSING_AND_ERR_FLAGS_L4PROTOCOL_SHIFT)) & flags;
+
+       if (val < QEDE_PKT_TYPE_MAX)
+               return ptype_lkup_tbl[val] | RTE_PTYPE_L2_ETHER;
+       else
+               return RTE_PTYPE_UNKNOWN;
 }
 
-static inline uint8_t qede_check_csum(uint16_t flag)
+static inline uint8_t
+qede_check_notunn_csum_l3(struct rte_mbuf *m, uint16_t flag)
 {
-       if (likely(!qede_tunn_exist(flag)))
-               return qede_check_notunn_csum(flag);
-       else
-               return qede_check_tunn_csum(flag);
+       struct ipv4_hdr *ip;
+       uint16_t pkt_csum;
+       uint16_t calc_csum;
+       uint16_t val;
+
+       val = ((PARSING_AND_ERR_FLAGS_IPHDRERROR_MASK <<
+               PARSING_AND_ERR_FLAGS_IPHDRERROR_SHIFT) & flag);
+
+       if (unlikely(val)) {
+               m->packet_type = qede_rx_cqe_to_pkt_type(flag);
+               if (RTE_ETH_IS_IPV4_HDR(m->packet_type)) {
+                       ip = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
+                                          sizeof(struct ether_hdr));
+                       pkt_csum = ip->hdr_checksum;
+                       ip->hdr_checksum = 0;
+                       calc_csum = rte_ipv4_cksum(ip);
+                       ip->hdr_checksum = pkt_csum;
+                       return (calc_csum != pkt_csum);
+               } else if (RTE_ETH_IS_IPV6_HDR(m->packet_type)) {
+                       return 1;
+               }
+       }
+       return 0;
 }
 
 static inline void qede_rx_bd_ring_consume(struct qede_rx_queue *rxq)
@@ -789,7 +761,7 @@ static inline void qede_rx_bd_ring_consume(struct qede_rx_queue *rxq)
 }
 
 static inline void
-qede_reuse_page(struct qede_dev *qdev,
+qede_reuse_page(__rte_unused struct qede_dev *qdev,
                struct qede_rx_queue *rxq, struct qede_rx_entry *curr_cons)
 {
        struct eth_rx_bd *rx_bd_prod = ecore_chain_produce(&rxq->rx_bd_ring);
@@ -822,56 +794,153 @@ qede_recycle_rx_bd_ring(struct qede_rx_queue *rxq,
        }
 }
 
-static inline uint32_t qede_rx_cqe_to_pkt_type(uint16_t flags)
+static inline void
+qede_rx_process_tpa_cmn_cont_end_cqe(__rte_unused struct qede_dev *qdev,
+                                    struct qede_rx_queue *rxq,
+                                    uint8_t agg_index, uint16_t len)
+{
+       struct qede_agg_info *tpa_info;
+       struct rte_mbuf *curr_frag; /* Pointer to currently filled TPA seg */
+       uint16_t cons_idx;
+
+       /* Under certain conditions it is possible that FW may not consume
+        * additional or new BD. So decision to consume the BD must be made
+        * based on len_list[0].
+        */
+       if (rte_le_to_cpu_16(len)) {
+               tpa_info = &rxq->tpa_info[agg_index];
+               cons_idx = rxq->sw_rx_cons & NUM_RX_BDS(rxq);
+               curr_frag = rxq->sw_rx_ring[cons_idx].mbuf;
+               assert(curr_frag);
+               curr_frag->nb_segs = 1;
+               curr_frag->pkt_len = rte_le_to_cpu_16(len);
+               curr_frag->data_len = curr_frag->pkt_len;
+               tpa_info->tpa_tail->next = curr_frag;
+               tpa_info->tpa_tail = curr_frag;
+               qede_rx_bd_ring_consume(rxq);
+               if (unlikely(qede_alloc_rx_buffer(rxq) != 0)) {
+                       PMD_RX_LOG(ERR, rxq, "mbuf allocation fails\n");
+                       rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
+                       rxq->rx_alloc_errors++;
+               }
+       }
+}
+
+static inline void
+qede_rx_process_tpa_cont_cqe(struct qede_dev *qdev,
+                            struct qede_rx_queue *rxq,
+                            struct eth_fast_path_rx_tpa_cont_cqe *cqe)
 {
-       uint32_t p_type;
-       /* TBD - L4 indications needed ? */
-       uint16_t protocol = ((PARSING_AND_ERR_FLAGS_L3TYPE_MASK <<
-                             PARSING_AND_ERR_FLAGS_L3TYPE_SHIFT) & flags);
-
-       /* protocol = 3 means LLC/SNAP over Ethernet */
-       if (unlikely(protocol == 0 || protocol == 3))
-               p_type = RTE_PTYPE_UNKNOWN;
-       else if (protocol == 1)
-               p_type = RTE_PTYPE_L3_IPV4;
-       else if (protocol == 2)
-               p_type = RTE_PTYPE_L3_IPV6;
-
-       return RTE_PTYPE_L2_ETHER | p_type;
+       PMD_RX_LOG(INFO, rxq, "TPA cont[%d] - len [%d]\n",
+                  cqe->tpa_agg_index, rte_le_to_cpu_16(cqe->len_list[0]));
+       /* only len_list[0] will have value */
+       qede_rx_process_tpa_cmn_cont_end_cqe(qdev, rxq, cqe->tpa_agg_index,
+                                            cqe->len_list[0]);
 }
 
-int qede_process_sg_pkts(void *p_rxq,  struct rte_mbuf *rx_mb,
-                        int num_segs, uint16_t pkt_len)
+static inline void
+qede_rx_process_tpa_end_cqe(struct qede_dev *qdev,
+                           struct qede_rx_queue *rxq,
+                           struct eth_fast_path_rx_tpa_end_cqe *cqe)
+{
+       struct rte_mbuf *rx_mb; /* Pointer to head of the chained agg */
+
+       qede_rx_process_tpa_cmn_cont_end_cqe(qdev, rxq, cqe->tpa_agg_index,
+                                            cqe->len_list[0]);
+       /* Update total length and frags based on end TPA */
+       rx_mb = rxq->tpa_info[cqe->tpa_agg_index].tpa_head;
+       /* TODO:  Add Sanity Checks */
+       rx_mb->nb_segs = cqe->num_of_bds;
+       rx_mb->pkt_len = cqe->total_packet_len;
+
+       PMD_RX_LOG(INFO, rxq, "TPA End[%d] reason %d cqe_len %d nb_segs %d"
+                  " pkt_len %d\n", cqe->tpa_agg_index, cqe->end_reason,
+                  rte_le_to_cpu_16(cqe->len_list[0]), rx_mb->nb_segs,
+                  rx_mb->pkt_len);
+}
+
+static inline uint32_t qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
+{
+       uint32_t val;
+
+       /* Lookup table */
+       static const uint32_t
+       ptype_tunn_lkup_tbl[QEDE_PKT_TYPE_TUNN_MAX_TYPE] __rte_cache_aligned = {
+               [QEDE_PKT_TYPE_UNKNOWN] = RTE_PTYPE_UNKNOWN,
+               [QEDE_PKT_TYPE_TUNN_GENEVE] = RTE_PTYPE_TUNNEL_GENEVE,
+               [QEDE_PKT_TYPE_TUNN_GRE] = RTE_PTYPE_TUNNEL_GRE,
+               [QEDE_PKT_TYPE_TUNN_VXLAN] = RTE_PTYPE_TUNNEL_VXLAN,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_NOEXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_L2_TENID_EXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L2_ETHER,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_NOEXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_NOEXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_NOEXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV4_TENID_EXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L3_IPV4,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_NOEXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_NOEXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_NOEXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_EXIST_GENEVE] =
+                               RTE_PTYPE_TUNNEL_GENEVE | RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_EXIST_GRE] =
+                               RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_L3_IPV6,
+               [QEDE_PKT_TYPE_TUNN_IPV6_TENID_EXIST_VXLAN] =
+                               RTE_PTYPE_TUNNEL_VXLAN | RTE_PTYPE_L3_IPV6,
+       };
+
+       /* Cover bits[4-0] to include tunn_type and next protocol */
+       val = ((ETH_TUNNEL_PARSING_FLAGS_TYPE_MASK <<
+               ETH_TUNNEL_PARSING_FLAGS_TYPE_SHIFT) |
+               (ETH_TUNNEL_PARSING_FLAGS_NEXT_PROTOCOL_MASK <<
+               ETH_TUNNEL_PARSING_FLAGS_NEXT_PROTOCOL_SHIFT)) & flags;
+
+       if (val < QEDE_PKT_TYPE_TUNN_MAX_TYPE)
+               return ptype_tunn_lkup_tbl[val];
+       else
+               return RTE_PTYPE_UNKNOWN;
+}
+
+static inline int
+qede_process_sg_pkts(void *p_rxq,  struct rte_mbuf *rx_mb,
+                    uint8_t num_segs, uint16_t pkt_len)
 {
        struct qede_rx_queue *rxq = p_rxq;
        struct qede_dev *qdev = rxq->qdev;
-       struct ecore_dev *edev = &qdev->edev;
-       uint16_t sw_rx_index, cur_size;
-
        register struct rte_mbuf *seg1 = NULL;
        register struct rte_mbuf *seg2 = NULL;
+       uint16_t sw_rx_index;
+       uint16_t cur_size;
 
        seg1 = rx_mb;
        while (num_segs) {
-               cur_size = pkt_len > rxq->rx_buf_size ?
-                               rxq->rx_buf_size : pkt_len;
-               if (!cur_size) {
-                       PMD_RX_LOG(DEBUG, rxq,
-                                  "SG packet, len and num BD mismatch\n");
+               cur_size = pkt_len > rxq->rx_buf_size ? rxq->rx_buf_size :
+                                                       pkt_len;
+               if (unlikely(!cur_size)) {
+                       PMD_RX_LOG(ERR, rxq, "Length is 0 while %u BDs"
+                                  " left for mapping jumbo", num_segs);
                        qede_recycle_rx_bd_ring(rxq, qdev, num_segs);
                        return -EINVAL;
                }
-
-               if (qede_alloc_rx_buffer(rxq)) {
-                       uint8_t index;
-
-                       PMD_RX_LOG(DEBUG, rxq, "Buffer allocation failed\n");
-                       index = rxq->port_id;
-                       rte_eth_devices[index].data->rx_mbuf_alloc_failed++;
-                       rxq->rx_alloc_errors++;
-                       return -ENOMEM;
-               }
-
                sw_rx_index = rxq->sw_rx_cons & NUM_RX_BDS(rxq);
                seg2 = rxq->sw_rx_ring[sw_rx_index].mbuf;
                qede_rx_bd_ring_consume(rxq);
@@ -881,16 +950,9 @@ int qede_process_sg_pkts(void *p_rxq,  struct rte_mbuf *rx_mb,
                seg1 = seg1->next;
                num_segs--;
                rxq->rx_segs++;
-               continue;
        }
-       seg1 = NULL;
-
-       if (pkt_len)
-               PMD_RX_LOG(DEBUG, rxq,
-                          "Mapped all BDs of jumbo, but still have %d bytes\n",
-                          pkt_len);
 
-       return ECORE_SUCCESS;
+       return 0;
 }
 
 uint16_t
@@ -903,14 +965,29 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        uint16_t hw_comp_cons, sw_comp_cons, sw_rx_index;
        uint16_t rx_pkt = 0;
        union eth_rx_cqe *cqe;
-       struct eth_fast_path_rx_reg_cqe *fp_cqe;
+       struct eth_fast_path_rx_reg_cqe *fp_cqe = NULL;
        register struct rte_mbuf *rx_mb = NULL;
        register struct rte_mbuf *seg1 = NULL;
        enum eth_rx_cqe_type cqe_type;
-       uint16_t len, pad, preload_idx, pkt_len, parse_flag;
-       uint8_t csum_flag, num_segs;
+       uint16_t pkt_len = 0; /* Sum of all BD segments */
+       uint16_t len; /* Length of first BD */
+       uint8_t num_segs = 1;
+       uint16_t preload_idx;
+       uint16_t parse_flag;
+#ifdef RTE_LIBRTE_QEDE_DEBUG_RX
+       uint8_t bitfield_val;
        enum rss_hash_type htype;
-       int ret;
+#endif
+       uint8_t tunn_parse_flag;
+       uint8_t j;
+       struct eth_fast_path_rx_tpa_start_cqe *cqe_start_tpa;
+       uint64_t ol_flags;
+       uint32_t packet_type;
+       uint16_t vlan_tci;
+       bool tpa_start_flg;
+       uint8_t offset, tpa_agg_idx, flags;
+       struct qede_agg_info *tpa_info = NULL;
+       uint32_t rss_hash;
 
        hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
        sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
@@ -921,16 +998,59 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                return 0;
 
        while (sw_comp_cons != hw_comp_cons) {
+               ol_flags = 0;
+               packet_type = RTE_PTYPE_UNKNOWN;
+               vlan_tci = 0;
+               tpa_start_flg = false;
+               rss_hash = 0;
+
                /* Get the CQE from the completion ring */
                cqe =
                    (union eth_rx_cqe *)ecore_chain_consume(&rxq->rx_comp_ring);
                cqe_type = cqe->fast_path_regular.type;
-
-               if (unlikely(cqe_type == ETH_RX_CQE_TYPE_SLOW_PATH)) {
-                       PMD_RX_LOG(DEBUG, rxq, "Got a slowath CQE\n");
-
+               PMD_RX_LOG(INFO, rxq, "Rx CQE type %d\n", cqe_type);
+
+               switch (cqe_type) {
+               case ETH_RX_CQE_TYPE_REGULAR:
+                       fp_cqe = &cqe->fast_path_regular;
+               break;
+               case ETH_RX_CQE_TYPE_TPA_START:
+                       cqe_start_tpa = &cqe->fast_path_tpa_start;
+                       tpa_info = &rxq->tpa_info[cqe_start_tpa->tpa_agg_index];
+                       tpa_start_flg = true;
+                       /* Mark it as LRO packet */
+                       ol_flags |= PKT_RX_LRO;
+                       /* In split mode,  seg_len is same as len_on_first_bd
+                        * and ext_bd_len_list will be empty since there are
+                        * no additional buffers
+                        */
+                       PMD_RX_LOG(INFO, rxq,
+                           "TPA start[%d] - len_on_first_bd %d header %d"
+                           " [bd_list[0] %d], [seg_len %d]\n",
+                           cqe_start_tpa->tpa_agg_index,
+                           rte_le_to_cpu_16(cqe_start_tpa->len_on_first_bd),
+                           cqe_start_tpa->header_len,
+                           rte_le_to_cpu_16(cqe_start_tpa->ext_bd_len_list[0]),
+                           rte_le_to_cpu_16(cqe_start_tpa->seg_len));
+
+               break;
+               case ETH_RX_CQE_TYPE_TPA_CONT:
+                       qede_rx_process_tpa_cont_cqe(qdev, rxq,
+                                                    &cqe->fast_path_tpa_cont);
+                       goto next_cqe;
+               case ETH_RX_CQE_TYPE_TPA_END:
+                       qede_rx_process_tpa_end_cqe(qdev, rxq,
+                                                   &cqe->fast_path_tpa_end);
+                       tpa_agg_idx = cqe->fast_path_tpa_end.tpa_agg_index;
+                       tpa_info = &rxq->tpa_info[tpa_agg_idx];
+                       rx_mb = rxq->tpa_info[tpa_agg_idx].tpa_head;
+                       goto tpa_end;
+               case ETH_RX_CQE_TYPE_SLOW_PATH:
+                       PMD_RX_LOG(INFO, rxq, "Got unexpected slowpath CQE\n");
                        qdev->ops->eth_cqe_completion(edev, fp->id,
                                (struct eth_slow_path_rx_cqe *)cqe);
+                       /* fall-thru */
+               default:
                        goto next_cqe;
                }
 
@@ -939,32 +1059,96 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rx_mb = rxq->sw_rx_ring[sw_rx_index].mbuf;
                assert(rx_mb != NULL);
 
-               /* non GRO */
-               fp_cqe = &cqe->fast_path_regular;
-
-               len = rte_le_to_cpu_16(fp_cqe->len_on_first_bd);
-               pad = fp_cqe->placement_offset;
-               assert((len + pad) <= rx_mb->buf_len);
-
-               PMD_RX_LOG(DEBUG, rxq,
-                          "CQE type = 0x%x, flags = 0x%x, vlan = 0x%x"
-                          " len = %u, parsing_flags = %d\n",
-                          cqe_type, fp_cqe->bitfields,
-                          rte_le_to_cpu_16(fp_cqe->vlan_tag),
-                          len, rte_le_to_cpu_16(fp_cqe->pars_flags.flags));
-
-               /* If this is an error packet then drop it */
-               parse_flag =
-                   rte_le_to_cpu_16(cqe->fast_path_regular.pars_flags.flags);
-               csum_flag = qede_check_csum(parse_flag);
-               if (unlikely(csum_flag == QEDE_CSUM_ERROR)) {
-                       PMD_RX_LOG(ERR, rxq,
-                                  "CQE in CONS = %u has error, flags = 0x%x "
-                                  "dropping incoming packet\n",
-                                  sw_comp_cons, parse_flag);
-                       rxq->rx_hw_errors++;
-                       qede_recycle_rx_bd_ring(rxq, qdev, fp_cqe->bd_num);
-                       goto next_cqe;
+               /* Handle regular CQE or TPA start CQE */
+               if (!tpa_start_flg) {
+                       parse_flag = rte_le_to_cpu_16(fp_cqe->pars_flags.flags);
+                       offset = fp_cqe->placement_offset;
+                       len = rte_le_to_cpu_16(fp_cqe->len_on_first_bd);
+                       pkt_len = rte_le_to_cpu_16(fp_cqe->pkt_len);
+                       vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
+                       rss_hash = rte_le_to_cpu_32(fp_cqe->rss_hash);
+#ifdef RTE_LIBRTE_QEDE_DEBUG_RX
+                       bitfield_val = fp_cqe->bitfields;
+                       htype = (uint8_t)GET_FIELD(bitfield_val,
+                                       ETH_FAST_PATH_RX_REG_CQE_RSS_HASH_TYPE);
+#endif
+               } else {
+                       parse_flag =
+                           rte_le_to_cpu_16(cqe_start_tpa->pars_flags.flags);
+                       offset = cqe_start_tpa->placement_offset;
+                       /* seg_len = len_on_first_bd */
+                       len = rte_le_to_cpu_16(cqe_start_tpa->len_on_first_bd);
+                       vlan_tci = rte_le_to_cpu_16(cqe_start_tpa->vlan_tag);
+#ifdef RTE_LIBRTE_QEDE_DEBUG_RX
+                       bitfield_val = cqe_start_tpa->bitfields;
+                       htype = (uint8_t)GET_FIELD(bitfield_val,
+                               ETH_FAST_PATH_RX_TPA_START_CQE_RSS_HASH_TYPE);
+#endif
+                       rss_hash = rte_le_to_cpu_32(cqe_start_tpa->rss_hash);
+               }
+               if (qede_tunn_exist(parse_flag)) {
+                       PMD_RX_LOG(INFO, rxq, "Rx tunneled packet\n");
+                       if (unlikely(qede_check_tunn_csum_l4(parse_flag))) {
+                               PMD_RX_LOG(ERR, rxq,
+                                           "L4 csum failed, flags = 0x%x\n",
+                                           parse_flag);
+                               rxq->rx_hw_errors++;
+                               ol_flags |= PKT_RX_L4_CKSUM_BAD;
+                       } else {
+                               ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+                               if (tpa_start_flg)
+                                       flags =
+                                        cqe_start_tpa->tunnel_pars_flags.flags;
+                               else
+                                       flags = fp_cqe->tunnel_pars_flags.flags;
+                               tunn_parse_flag = flags;
+                               packet_type =
+                               qede_rx_cqe_to_tunn_pkt_type(tunn_parse_flag);
+                       }
+               } else {
+                       PMD_RX_LOG(INFO, rxq, "Rx non-tunneled packet\n");
+                       if (unlikely(qede_check_notunn_csum_l4(parse_flag))) {
+                               PMD_RX_LOG(ERR, rxq,
+                                           "L4 csum failed, flags = 0x%x\n",
+                                           parse_flag);
+                               rxq->rx_hw_errors++;
+                               ol_flags |= PKT_RX_L4_CKSUM_BAD;
+                       } else {
+                               ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+                       }
+                       if (unlikely(qede_check_notunn_csum_l3(rx_mb,
+                                                       parse_flag))) {
+                               PMD_RX_LOG(ERR, rxq,
+                                          "IP csum failed, flags = 0x%x\n",
+                                          parse_flag);
+                               rxq->rx_hw_errors++;
+                               ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       } else {
+                               ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+                               packet_type =
+                                       qede_rx_cqe_to_pkt_type(parse_flag);
+                       }
+               }
+
+               if (CQE_HAS_VLAN(parse_flag)) {
+                       ol_flags |= PKT_RX_VLAN_PKT;
+                       if (qdev->vlan_strip_flg) {
+                               ol_flags |= PKT_RX_VLAN_STRIPPED;
+                               rx_mb->vlan_tci = vlan_tci;
+                       }
+               }
+               if (CQE_HAS_OUTER_VLAN(parse_flag)) {
+                       ol_flags |= PKT_RX_QINQ_PKT;
+                       if (qdev->vlan_strip_flg) {
+                               rx_mb->vlan_tci = vlan_tci;
+                               ol_flags |= PKT_RX_QINQ_STRIPPED;
+                       }
+                       rx_mb->vlan_tci_outer = 0;
+               }
+               /* RSS Hash */
+               if (qdev->rss_enable) {
+                       ol_flags |= PKT_RX_RSS_HASH;
+                       rx_mb->hash.rss = rss_hash;
                }
 
                if (unlikely(qede_alloc_rx_buffer(rxq) != 0)) {
@@ -977,73 +1161,66 @@ qede_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        rxq->rx_alloc_errors++;
                        break;
                }
-
                qede_rx_bd_ring_consume(rxq);
 
-               if (fp_cqe->bd_num > 1) {
-                       pkt_len = rte_le_to_cpu_16(fp_cqe->pkt_len);
+               if (!tpa_start_flg && fp_cqe->bd_num > 1) {
+                       PMD_RX_LOG(DEBUG, rxq, "Jumbo-over-BD packet: %02x BDs"
+                                  " len on first: %04x Total Len: %04x",
+                                  fp_cqe->bd_num, len, pkt_len);
                        num_segs = fp_cqe->bd_num - 1;
-
-                       rxq->rx_segs++;
-
-                       pkt_len -= len;
                        seg1 = rx_mb;
-                       ret = qede_process_sg_pkts(p_rxq, seg1, num_segs,
-                                                  pkt_len);
-                       if (ret != ECORE_SUCCESS) {
-                               qede_recycle_rx_bd_ring(rxq, qdev,
-                                                       fp_cqe->bd_num);
+                       if (qede_process_sg_pkts(p_rxq, seg1, num_segs,
+                                                pkt_len - len))
                                goto next_cqe;
+                       for (j = 0; j < num_segs; j++) {
+                               if (qede_alloc_rx_buffer(rxq)) {
+                                       PMD_RX_LOG(ERR, rxq,
+                                               "Buffer allocation failed");
+                                       rte_eth_devices[rxq->port_id].
+                                               data->rx_mbuf_alloc_failed++;
+                                       rxq->rx_alloc_errors++;
+                                       break;
+                               }
+                               rxq->rx_segs++;
                        }
                }
+               rxq->rx_segs++; /* for the first segment */
 
                /* Prefetch next mbuf while processing current one. */
                preload_idx = rxq->sw_rx_cons & NUM_RX_BDS(rxq);
                rte_prefetch0(rxq->sw_rx_ring[preload_idx].mbuf);
 
-               /* Update MBUF fields */
-               rx_mb->ol_flags = 0;
-               rx_mb->data_off = pad + RTE_PKTMBUF_HEADROOM;
-               rx_mb->nb_segs = fp_cqe->bd_num;
-               rx_mb->data_len = len;
-               rx_mb->pkt_len = fp_cqe->pkt_len;
+               /* Update rest of the MBUF fields */
+               rx_mb->data_off = offset + RTE_PKTMBUF_HEADROOM;
                rx_mb->port = rxq->port_id;
-               rx_mb->packet_type = qede_rx_cqe_to_pkt_type(parse_flag);
-
-               htype = (uint8_t)GET_FIELD(fp_cqe->bitfields,
-                               ETH_FAST_PATH_RX_REG_CQE_RSS_HASH_TYPE);
-               if (qdev->rss_enabled && htype) {
-                       rx_mb->ol_flags |= PKT_RX_RSS_HASH;
-                       rx_mb->hash.rss = rte_le_to_cpu_32(fp_cqe->rss_hash);
-                       PMD_RX_LOG(DEBUG, rxq, "Hash result 0x%x\n",
-                                  rx_mb->hash.rss);
+               rx_mb->ol_flags = ol_flags;
+               rx_mb->data_len = len;
+               rx_mb->packet_type = packet_type;
+               PMD_RX_LOG(INFO, rxq,
+                          "pkt_type 0x%04x len %u hash_type %d hash_val 0x%x"
+                          " ol_flags 0x%04lx\n",
+                          packet_type, len, htype, rx_mb->hash.rss,
+                          (unsigned long)ol_flags);
+               if (!tpa_start_flg) {
+                       rx_mb->nb_segs = fp_cqe->bd_num;
+                       rx_mb->pkt_len = pkt_len;
+               } else {
+                       /* store ref to the updated mbuf */
+                       tpa_info->tpa_head = rx_mb;
+                       tpa_info->tpa_tail = tpa_info->tpa_head;
                }
-
                rte_prefetch1(rte_pktmbuf_mtod(rx_mb, void *));
-
-               if (CQE_HAS_VLAN(parse_flag)) {
-                       rx_mb->vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
-                       rx_mb->ol_flags |= PKT_RX_VLAN_PKT;
+tpa_end:
+               if (!tpa_start_flg) {
+                       rx_pkts[rx_pkt] = rx_mb;
+                       rx_pkt++;
                }
-
-               if (CQE_HAS_OUTER_VLAN(parse_flag)) {
-                       /* FW does not provide indication of Outer VLAN tag,
-                        * which is always stripped, so vlan_tci_outer is set
-                        * to 0. Here vlan_tag represents inner VLAN tag.
-                        */
-                       rx_mb->vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
-                       rx_mb->ol_flags |= PKT_RX_QINQ_PKT;
-                       rx_mb->vlan_tci_outer = 0;
-               }
-
-               rx_pkts[rx_pkt] = rx_mb;
-               rx_pkt++;
 next_cqe:
                ecore_chain_recycle_consumed(&rxq->rx_comp_ring);
                sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
                if (rx_pkt == nb_pkts) {
                        PMD_RX_LOG(DEBUG, rxq,
-                                  "Budget reached nb_pkts=%u received=%u\n",
+                                  "Budget reached nb_pkts=%u received=%u",
                                   rx_pkt, nb_pkts);
                        break;
                }
@@ -1053,108 +1230,100 @@ next_cqe:
 
        rxq->rcv_pkts += rx_pkt;
 
-       PMD_RX_LOG(DEBUG, rxq, "rx_pkts=%u core=%d\n", rx_pkt, rte_lcore_id());
+       PMD_RX_LOG(DEBUG, rxq, "rx_pkts=%u core=%d", rx_pkt, rte_lcore_id());
 
        return rx_pkt;
 }
 
-static inline int
-qede_free_tx_pkt(struct ecore_dev *edev, struct qede_tx_queue *txq)
+static inline void
+qede_free_tx_pkt(struct qede_tx_queue *txq)
 {
-       uint16_t nb_segs, idx = TX_CONS(txq);
-       struct eth_tx_bd *tx_data_bd;
-       struct rte_mbuf *mbuf = txq->sw_tx_ring[idx].mbuf;
-
-       if (unlikely(!mbuf)) {
-               PMD_TX_LOG(ERR, txq, "null mbuf\n");
-               PMD_TX_LOG(ERR, txq,
-                          "tx_desc %u tx_avail %u tx_cons %u tx_prod %u\n",
-                          txq->nb_tx_desc, txq->nb_tx_avail, idx,
-                          TX_PROD(txq));
-               return -1;
-       }
+       struct rte_mbuf *mbuf;
+       uint16_t nb_segs;
+       uint16_t idx;
 
-       nb_segs = mbuf->nb_segs;
-       while (nb_segs) {
-               /* It's like consuming rxbuf in recv() */
+       idx = TX_CONS(txq);
+       mbuf = txq->sw_tx_ring[idx].mbuf;
+       if (mbuf) {
+               nb_segs = mbuf->nb_segs;
+               PMD_TX_LOG(DEBUG, txq, "nb_segs to free %u\n", nb_segs);
+               while (nb_segs) {
+                       /* It's like consuming rxbuf in recv() */
+                       ecore_chain_consume(&txq->tx_pbl);
+                       txq->nb_tx_avail++;
+                       nb_segs--;
+               }
+               rte_pktmbuf_free(mbuf);
+               txq->sw_tx_ring[idx].mbuf = NULL;
+               txq->sw_tx_cons++;
+               PMD_TX_LOG(DEBUG, txq, "Freed tx packet\n");
+       } else {
                ecore_chain_consume(&txq->tx_pbl);
                txq->nb_tx_avail++;
-               nb_segs--;
        }
-       rte_pktmbuf_free(mbuf);
-       txq->sw_tx_ring[idx].mbuf = NULL;
-
-       return 0;
 }
 
-static inline uint16_t
-qede_process_tx_compl(struct ecore_dev *edev, struct qede_tx_queue *txq)
+static inline void
+qede_process_tx_compl(__rte_unused struct ecore_dev *edev,
+                     struct qede_tx_queue *txq)
 {
-       uint16_t tx_compl = 0;
        uint16_t hw_bd_cons;
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+       uint16_t sw_tx_cons;
+#endif
 
-       hw_bd_cons = rte_le_to_cpu_16(*txq->hw_cons_ptr);
        rte_compiler_barrier();
-
-       while (hw_bd_cons != ecore_chain_get_cons_idx(&txq->tx_pbl)) {
-               if (qede_free_tx_pkt(edev, txq)) {
-                       PMD_TX_LOG(ERR, txq,
-                                  "hw_bd_cons = %u, chain_cons = %u\n",
-                                  hw_bd_cons,
-                                  ecore_chain_get_cons_idx(&txq->tx_pbl));
-                       break;
-               }
-               txq->sw_tx_cons++;      /* Making TXD available */
-               tx_compl++;
-       }
-
-       PMD_TX_LOG(DEBUG, txq, "Tx compl %u sw_tx_cons %u avail %u\n",
-                  tx_compl, txq->sw_tx_cons, txq->nb_tx_avail);
-       return tx_compl;
+       hw_bd_cons = rte_le_to_cpu_16(*txq->hw_cons_ptr);
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+       sw_tx_cons = ecore_chain_get_cons_idx(&txq->tx_pbl);
+       PMD_TX_LOG(DEBUG, txq, "Tx Completions = %u\n",
+                  abs(hw_bd_cons - sw_tx_cons));
+#endif
+       while (hw_bd_cons !=  ecore_chain_get_cons_idx(&txq->tx_pbl))
+               qede_free_tx_pkt(txq);
 }
 
 /* Populate scatter gather buffer descriptor fields */
-static inline uint16_t qede_encode_sg_bd(struct qede_tx_queue *p_txq,
-                                        struct rte_mbuf *m_seg,
-                                        uint16_t count,
-                                        struct eth_tx_1st_bd *bd1)
+static inline uint8_t
+qede_encode_sg_bd(struct qede_tx_queue *p_txq, struct rte_mbuf *m_seg,
+                 struct eth_tx_2nd_bd **bd2, struct eth_tx_3rd_bd **bd3)
 {
        struct qede_tx_queue *txq = p_txq;
-       struct eth_tx_2nd_bd *bd2 = NULL;
-       struct eth_tx_3rd_bd *bd3 = NULL;
        struct eth_tx_bd *tx_bd = NULL;
-       uint16_t nb_segs = count;
        dma_addr_t mapping;
+       uint8_t nb_segs = 0;
 
        /* Check for scattered buffers */
        while (m_seg) {
-               if (nb_segs == 1) {
-                       bd2 = (struct eth_tx_2nd_bd *)
-                               ecore_chain_produce(&txq->tx_pbl);
-                       memset(bd2, 0, sizeof(*bd2));
+               if (nb_segs == 0) {
+                       if (!*bd2) {
+                               *bd2 = (struct eth_tx_2nd_bd *)
+                                       ecore_chain_produce(&txq->tx_pbl);
+                               memset(*bd2, 0, sizeof(struct eth_tx_2nd_bd));
+                               nb_segs++;
+                       }
                        mapping = rte_mbuf_data_dma_addr(m_seg);
-                       bd2->addr.hi = rte_cpu_to_le_32(U64_HI(mapping));
-                       bd2->addr.lo = rte_cpu_to_le_32(U64_LO(mapping));
-                       bd2->nbytes = rte_cpu_to_le_16(m_seg->data_len);
-               } else if (nb_segs == 2) {
-                       bd3 = (struct eth_tx_3rd_bd *)
-                               ecore_chain_produce(&txq->tx_pbl);
-                       memset(bd3, 0, sizeof(*bd3));
+                       QEDE_BD_SET_ADDR_LEN(*bd2, mapping, m_seg->data_len);
+                       PMD_TX_LOG(DEBUG, txq, "BD2 len %04x", m_seg->data_len);
+               } else if (nb_segs == 1) {
+                       if (!*bd3) {
+                               *bd3 = (struct eth_tx_3rd_bd *)
+                                       ecore_chain_produce(&txq->tx_pbl);
+                               memset(*bd3, 0, sizeof(struct eth_tx_3rd_bd));
+                               nb_segs++;
+                       }
                        mapping = rte_mbuf_data_dma_addr(m_seg);
-                       bd3->addr.hi = rte_cpu_to_le_32(U64_HI(mapping));
-                       bd3->addr.lo = rte_cpu_to_le_32(U64_LO(mapping));
-                       bd3->nbytes = rte_cpu_to_le_16(m_seg->data_len);
+                       QEDE_BD_SET_ADDR_LEN(*bd3, mapping, m_seg->data_len);
+                       PMD_TX_LOG(DEBUG, txq, "BD3 len %04x", m_seg->data_len);
                } else {
                        tx_bd = (struct eth_tx_bd *)
                                ecore_chain_produce(&txq->tx_pbl);
                        memset(tx_bd, 0, sizeof(*tx_bd));
+                       nb_segs++;
                        mapping = rte_mbuf_data_dma_addr(m_seg);
-                       tx_bd->addr.hi = rte_cpu_to_le_32(U64_HI(mapping));
-                       tx_bd->addr.lo = rte_cpu_to_le_32(U64_LO(mapping));
-                       tx_bd->nbytes = rte_cpu_to_le_16(m_seg->data_len);
+                       QEDE_BD_SET_ADDR_LEN(tx_bd, mapping, m_seg->data_len);
+                       PMD_TX_LOG(DEBUG, txq, "BD len %04x", m_seg->data_len);
                }
-               nb_segs++;
-               bd1->data.nbds = nb_segs;
                m_seg = m_seg->next;
        }
 
@@ -1162,88 +1331,314 @@ static inline uint16_t qede_encode_sg_bd(struct qede_tx_queue *p_txq,
        return nb_segs;
 }
 
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+static inline void
+print_tx_bd_info(struct qede_tx_queue *txq,
+                struct eth_tx_1st_bd *bd1,
+                struct eth_tx_2nd_bd *bd2,
+                struct eth_tx_3rd_bd *bd3,
+                uint64_t tx_ol_flags)
+{
+       char ol_buf[256] = { 0 }; /* for verbose prints */
+
+       if (bd1)
+               PMD_TX_LOG(INFO, txq,
+                          "BD1: nbytes=%u nbds=%u bd_flags=04%x bf=%04x",
+                          rte_cpu_to_le_16(bd1->nbytes), bd1->data.nbds,
+                          bd1->data.bd_flags.bitfields,
+                          rte_cpu_to_le_16(bd1->data.bitfields));
+       if (bd2)
+               PMD_TX_LOG(INFO, txq,
+                          "BD2: nbytes=%u bf=%04x\n",
+                          rte_cpu_to_le_16(bd2->nbytes), bd2->data.bitfields1);
+       if (bd3)
+               PMD_TX_LOG(INFO, txq,
+                          "BD3: nbytes=%u bf=%04x mss=%u\n",
+                          rte_cpu_to_le_16(bd3->nbytes),
+                          rte_cpu_to_le_16(bd3->data.bitfields),
+                          rte_cpu_to_le_16(bd3->data.lso_mss));
+
+       rte_get_tx_ol_flag_list(tx_ol_flags, ol_buf, sizeof(ol_buf));
+       PMD_TX_LOG(INFO, txq, "TX offloads = %s\n", ol_buf);
+}
+#endif
+
+/* TX prepare to check packets meets TX conditions */
+uint16_t
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+qede_xmit_prep_pkts(void *p_txq, struct rte_mbuf **tx_pkts,
+                   uint16_t nb_pkts)
+{
+       struct qede_tx_queue *txq = p_txq;
+#else
+qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts,
+                   uint16_t nb_pkts)
+{
+#endif
+       uint64_t ol_flags;
+       struct rte_mbuf *m;
+       uint16_t i;
+       int ret;
+
+       for (i = 0; i < nb_pkts; i++) {
+               m = tx_pkts[i];
+               ol_flags = m->ol_flags;
+               if (ol_flags & PKT_TX_TCP_SEG) {
+                       if (m->nb_segs >= ETH_TX_MAX_BDS_PER_LSO_PACKET) {
+                               rte_errno = -EINVAL;
+                               break;
+                       }
+                       /* TBD: confirm its ~9700B for both ? */
+                       if (m->tso_segsz > ETH_TX_MAX_NON_LSO_PKT_LEN) {
+                               rte_errno = -EINVAL;
+                               break;
+                       }
+               } else {
+                       if (m->nb_segs >= ETH_TX_MAX_BDS_PER_NON_LSO_PACKET) {
+                               rte_errno = -EINVAL;
+                               break;
+                       }
+               }
+               if (ol_flags & QEDE_TX_OFFLOAD_NOTSUP_MASK) {
+                       rte_errno = -ENOTSUP;
+                       break;
+               }
+
+#ifdef RTE_LIBRTE_ETHDEV_DEBUG
+               ret = rte_validate_tx_offload(m);
+               if (ret != 0) {
+                       rte_errno = ret;
+                       break;
+               }
+#endif
+               /* TBD: pseudo csum calcuation required iff
+                * ETH_TX_DATA_2ND_BD_L4_PSEUDO_CSUM_MODE not set?
+                */
+               ret = rte_net_intel_cksum_prepare(m);
+               if (ret != 0) {
+                       rte_errno = ret;
+                       break;
+               }
+       }
+
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+       if (unlikely(i != nb_pkts))
+               PMD_TX_LOG(ERR, txq, "TX prepare failed for %u\n",
+                          nb_pkts - i);
+#endif
+       return i;
+}
+
 uint16_t
 qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
        struct qede_tx_queue *txq = p_txq;
        struct qede_dev *qdev = txq->qdev;
        struct ecore_dev *edev = &qdev->edev;
-       struct qede_fastpath *fp;
-       struct eth_tx_1st_bd *bd1;
+       struct rte_mbuf *mbuf;
        struct rte_mbuf *m_seg = NULL;
        uint16_t nb_tx_pkts;
-       uint16_t nb_pkt_sent = 0;
        uint16_t bd_prod;
        uint16_t idx;
-       uint16_t tx_count;
-       uint16_t nb_segs = 0;
-
-       fp = &qdev->fp_array[QEDE_RSS_COUNT(qdev) + txq->queue_id];
+       uint16_t nb_frags;
+       uint16_t nb_pkt_sent = 0;
+       uint8_t nbds;
+       bool ipv6_ext_flg;
+       bool lso_flg;
+       bool tunn_flg;
+       struct eth_tx_1st_bd *bd1;
+       struct eth_tx_2nd_bd *bd2;
+       struct eth_tx_3rd_bd *bd3;
+       uint64_t tx_ol_flags;
+       uint16_t hdr_size;
 
        if (unlikely(txq->nb_tx_avail < txq->tx_free_thresh)) {
-               PMD_TX_LOG(DEBUG, txq, "send=%u avail=%u free_thresh=%u\n",
+               PMD_TX_LOG(DEBUG, txq, "send=%u avail=%u free_thresh=%u",
                           nb_pkts, txq->nb_tx_avail, txq->tx_free_thresh);
-               (void)qede_process_tx_compl(edev, txq);
-       }
-
-       nb_tx_pkts = RTE_MIN(nb_pkts, (txq->nb_tx_avail /
-                       ETH_TX_MAX_BDS_PER_NON_LSO_PACKET));
-       if (unlikely(nb_tx_pkts == 0)) {
-               PMD_TX_LOG(DEBUG, txq, "Out of BDs nb_pkts=%u avail=%u\n",
-                          nb_pkts, txq->nb_tx_avail);
-               return 0;
+               qede_process_tx_compl(edev, txq);
        }
 
-       tx_count = nb_tx_pkts;
+       nb_tx_pkts  = nb_pkts;
+       bd_prod = rte_cpu_to_le_16(ecore_chain_get_prod_idx(&txq->tx_pbl));
        while (nb_tx_pkts--) {
+               /* Init flags/values */
+               ipv6_ext_flg = false;
+               tunn_flg = false;
+               lso_flg = false;
+               nbds = 0;
+               bd1 = NULL;
+               bd2 = NULL;
+               bd3 = NULL;
+               hdr_size = 0;
+
+               mbuf = *tx_pkts++;
+               assert(mbuf);
+
+               /* Check minimum TX BDS availability against available BDs */
+               if (unlikely(txq->nb_tx_avail < mbuf->nb_segs))
+                       break;
+
+               tx_ol_flags = mbuf->ol_flags;
+
+#define RTE_ETH_IS_IPV6_HDR_EXT(ptype) ((ptype) & RTE_PTYPE_L3_IPV6_EXT)
+               if (RTE_ETH_IS_IPV6_HDR_EXT(mbuf->packet_type))
+                       ipv6_ext_flg = true;
+
+               if (RTE_ETH_IS_TUNNEL_PKT(mbuf->packet_type))
+                       tunn_flg = true;
+
+               if (tx_ol_flags & PKT_TX_TCP_SEG)
+                       lso_flg = true;
+
+               if (lso_flg) {
+                       if (unlikely(txq->nb_tx_avail <
+                                               ETH_TX_MIN_BDS_PER_LSO_PKT))
+                               break;
+               } else {
+                       if (unlikely(txq->nb_tx_avail <
+                                       ETH_TX_MIN_BDS_PER_NON_LSO_PKT))
+                               break;
+               }
+
+               if (tunn_flg && ipv6_ext_flg) {
+                       if (unlikely(txq->nb_tx_avail <
+                               ETH_TX_MIN_BDS_PER_TUNN_IPV6_WITH_EXT_PKT))
+                               break;
+               }
+               if (ipv6_ext_flg) {
+                       if (unlikely(txq->nb_tx_avail <
+                                       ETH_TX_MIN_BDS_PER_IPV6_WITH_EXT_PKT))
+                               break;
+               }
+
                /* Fill the entry in the SW ring and the BDs in the FW ring */
                idx = TX_PROD(txq);
-               struct rte_mbuf *mbuf = *tx_pkts++;
-
                txq->sw_tx_ring[idx].mbuf = mbuf;
+
+               /* BD1 */
                bd1 = (struct eth_tx_1st_bd *)ecore_chain_produce(&txq->tx_pbl);
-               /* Zero init struct fields */
-               bd1->data.bd_flags.bitfields = 0;
-               bd1->data.bitfields = 0;
+               memset(bd1, 0, sizeof(struct eth_tx_1st_bd));
+               nbds++;
 
-               bd1->data.bd_flags.bitfields =
+               bd1->data.bd_flags.bitfields |=
                        1 << ETH_TX_1ST_BD_FLAGS_START_BD_SHIFT;
-               /* Map MBUF linear data for DMA and set in the first BD */
-               QEDE_BD_SET_ADDR_LEN(bd1, rte_mbuf_data_dma_addr(mbuf),
-                                    mbuf->pkt_len);
+               /* FW 8.10.x specific change */
+               if (!lso_flg) {
+                       bd1->data.bitfields |=
+                       (mbuf->pkt_len & ETH_TX_DATA_1ST_BD_PKT_LEN_MASK)
+                               << ETH_TX_DATA_1ST_BD_PKT_LEN_SHIFT;
+                       /* Map MBUF linear data for DMA and set in the BD1 */
+                       QEDE_BD_SET_ADDR_LEN(bd1, rte_mbuf_data_dma_addr(mbuf),
+                                            mbuf->data_len);
+               } else {
+                       /* For LSO, packet header and payload must reside on
+                        * buffers pointed by different BDs. Using BD1 for HDR
+                        * and BD2 onwards for data.
+                        */
+                       hdr_size = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;
+                       QEDE_BD_SET_ADDR_LEN(bd1, rte_mbuf_data_dma_addr(mbuf),
+                                            hdr_size);
+               }
+
+               if (tunn_flg) {
+                       /* First indicate its a tunnel pkt */
+                       bd1->data.bd_flags.bitfields |=
+                               ETH_TX_DATA_1ST_BD_TUNN_FLAG_MASK <<
+                               ETH_TX_DATA_1ST_BD_TUNN_FLAG_SHIFT;
+
+                       /* Legacy FW had flipped behavior in regard to this bit
+                        * i.e. it needed to set to prevent FW from touching
+                        * encapsulated packets when it didn't need to.
+                        */
+                       if (unlikely(txq->is_legacy))
+                               bd1->data.bitfields ^=
+                                       1 << ETH_TX_DATA_1ST_BD_TUNN_FLAG_SHIFT;
+
+                       /* Outer IP checksum offload */
+                       if (tx_ol_flags & PKT_TX_OUTER_IP_CKSUM) {
+                               bd1->data.bd_flags.bitfields |=
+                                       ETH_TX_1ST_BD_FLAGS_TUNN_IP_CSUM_MASK <<
+                                       ETH_TX_1ST_BD_FLAGS_TUNN_IP_CSUM_SHIFT;
+                       }
+
+                       /* Outer UDP checksum offload */
+                       bd1->data.bd_flags.bitfields |=
+                               ETH_TX_1ST_BD_FLAGS_TUNN_L4_CSUM_MASK <<
+                               ETH_TX_1ST_BD_FLAGS_TUNN_L4_CSUM_SHIFT;
+               }
 
                /* Descriptor based VLAN insertion */
-               if (mbuf->ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) {
+               if (tx_ol_flags & (PKT_TX_VLAN_PKT | PKT_TX_QINQ_PKT)) {
                        bd1->data.vlan = rte_cpu_to_le_16(mbuf->vlan_tci);
                        bd1->data.bd_flags.bitfields |=
                            1 << ETH_TX_1ST_BD_FLAGS_VLAN_INSERTION_SHIFT;
                }
 
+               if (lso_flg)
+                       bd1->data.bd_flags.bitfields |=
+                               1 << ETH_TX_1ST_BD_FLAGS_LSO_SHIFT;
+
                /* Offload the IP checksum in the hardware */
-               if (mbuf->ol_flags & PKT_TX_IP_CKSUM) {
+               if ((lso_flg) || (tx_ol_flags & PKT_TX_IP_CKSUM))
                        bd1->data.bd_flags.bitfields |=
                            1 << ETH_TX_1ST_BD_FLAGS_IP_CSUM_SHIFT;
-               }
 
                /* L4 checksum offload (tcp or udp) */
-               if (mbuf->ol_flags & (PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM)) {
+               if ((lso_flg) || (tx_ol_flags & (PKT_TX_TCP_CKSUM |
+                                               PKT_TX_UDP_CKSUM)))
+                       /* PKT_TX_TCP_SEG implies PKT_TX_TCP_CKSUM */
                        bd1->data.bd_flags.bitfields |=
                            1 << ETH_TX_1ST_BD_FLAGS_L4_CSUM_SHIFT;
-                       /* IPv6 + extn. -> later */
+
+               /* BD2 */
+               if (lso_flg || ipv6_ext_flg) {
+                       bd2 = (struct eth_tx_2nd_bd *)ecore_chain_produce
+                                                       (&txq->tx_pbl);
+                       memset(bd2, 0, sizeof(struct eth_tx_2nd_bd));
+                       nbds++;
+                       QEDE_BD_SET_ADDR_LEN(bd2,
+                                           (hdr_size +
+                                           rte_mbuf_data_dma_addr(mbuf)),
+                                           mbuf->data_len - hdr_size);
+                       /* TBD: check pseudo csum iff tx_prepare not called? */
+                       if (ipv6_ext_flg) {
+                               bd2->data.bitfields1 |=
+                               ETH_L4_PSEUDO_CSUM_ZERO_LENGTH <<
+                               ETH_TX_DATA_2ND_BD_L4_PSEUDO_CSUM_MODE_SHIFT;
+                       }
+               }
+
+               /* BD3 */
+               if (lso_flg || ipv6_ext_flg) {
+                       bd3 = (struct eth_tx_3rd_bd *)ecore_chain_produce
+                                                       (&txq->tx_pbl);
+                       memset(bd3, 0, sizeof(struct eth_tx_3rd_bd));
+                       nbds++;
+                       if (lso_flg) {
+                               bd3->data.lso_mss =
+                                       rte_cpu_to_le_16(mbuf->tso_segsz);
+                               /* Using one header BD */
+                               bd3->data.bitfields |=
+                                       rte_cpu_to_le_16(1 <<
+                                       ETH_TX_DATA_3RD_BD_HDR_NBD_SHIFT);
+                       }
                }
 
                /* Handle fragmented MBUF */
                m_seg = mbuf->next;
-               nb_segs++;
-               bd1->data.nbds = nb_segs;
                /* Encode scatter gather buffer descriptors if required */
-               nb_segs = qede_encode_sg_bd(txq, m_seg, nb_segs, bd1);
-               txq->nb_tx_avail = txq->nb_tx_avail - nb_segs;
-               nb_segs = 0;
+               nb_frags = qede_encode_sg_bd(txq, m_seg, &bd2, &bd3);
+               bd1->data.nbds = nbds + nb_frags;
+               txq->nb_tx_avail -= bd1->data.nbds;
                txq->sw_tx_prod++;
                rte_prefetch0(txq->sw_tx_ring[TX_PROD(txq)].mbuf);
                bd_prod =
                    rte_cpu_to_le_16(ecore_chain_get_prod_idx(&txq->tx_pbl));
+#ifdef RTE_LIBRTE_QEDE_DEBUG_TX
+               print_tx_bd_info(txq, bd1, bd2, bd3, tx_ol_flags);
+               PMD_TX_LOG(INFO, txq, "lso=%d tunn=%d ipv6_ext=%d\n",
+                          lso_flg, tunn_flg, ipv6_ext_flg);
+#endif
                nb_pkt_sent++;
                txq->xmit_pkts++;
        }
@@ -1252,14 +1647,14 @@ qede_xmit_pkts(void *p_txq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        txq->tx_db.data.bd_prod = bd_prod;
        rte_wmb();
        rte_compiler_barrier();
-       DIRECT_REG_WR(edev, txq->doorbell_addr, txq->tx_db.raw);
+       DIRECT_REG_WR_RELAXED(edev, txq->doorbell_addr, txq->tx_db.raw);
        rte_wmb();
 
        /* Check again for Tx completions */
-       (void)qede_process_tx_compl(edev, txq);
+       qede_process_tx_compl(edev, txq);
 
-       PMD_TX_LOG(DEBUG, txq, "to_send=%u can_send=%u sent=%u core=%d\n",
-                  nb_pkts, tx_count, nb_pkt_sent, rte_lcore_id());
+       PMD_TX_LOG(DEBUG, txq, "to_send=%u sent=%u bd_prod=%u core=%d",
+                  nb_pkts, nb_pkt_sent, TX_PROD(txq), rte_lcore_id());
 
        return nb_pkt_sent;
 }
@@ -1268,7 +1663,7 @@ static void qede_init_fp_queue(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
        struct qede_fastpath *fp;
-       uint8_t i, rss_id, txq_index, tc;
+       uint8_t i, txq_index, tc;
        int rxq = 0, txq = 0;
 
        for_each_queue(i) {
@@ -1284,6 +1679,8 @@ static void qede_init_fp_queue(struct rte_eth_dev *eth_dev)
                                fp->txqs[tc] =
                                        eth_dev->data->tx_queues[txq_index];
                                fp->txqs[tc]->queue_id = txq_index;
+                               if (qdev->dev_info.is_legacy)
+                                       fp->txqs[tc]->is_legacy = true;
                        }
                        txq++;
                }
@@ -1294,9 +1691,7 @@ int qede_dev_start(struct rte_eth_dev *eth_dev)
 {
        struct qede_dev *qdev = eth_dev->data->dev_private;
        struct ecore_dev *edev = &qdev->edev;
-       struct qed_link_output link_output;
-       struct qede_fastpath *fp;
-       int rc, i;
+       int rc;
 
        DP_INFO(edev, "Device state is %d\n", qdev->state);
 
@@ -1315,13 +1710,18 @@ int qede_dev_start(struct rte_eth_dev *eth_dev)
                return rc;
        }
 
+       /* Newer SR-IOV PF driver expects RX/TX queues to be started before
+        * enabling RSS. Hence RSS configuration is deferred upto this point.
+        * Also, we would like to retain similar behavior in PF case, so we
+        * don't do PF/VF specific check here.
+        */
+       if (eth_dev->data->dev_conf.rxmode.mq_mode  == ETH_MQ_RX_RSS)
+               if (qede_config_rss(eth_dev))
+                       return -1;
+
        /* Bring-up the link */
        qede_dev_set_link_state(eth_dev, true);
 
-       /* Reset ring */
-       if (qede_reset_fp_rings(qdev))
-               return -ENOMEM;
-
        /* Start/resume traffic */
        qdev->ops->fastpath_start(edev);
 
@@ -1342,8 +1742,7 @@ static int qede_drain_txq(struct qede_dev *qdev,
                qede_process_tx_compl(edev, txq);
                if (!cnt) {
                        if (allow_drain) {
-                               DP_NOTICE(edev, false,
-                                         "Tx queue[%u] is stuck,"
+                               DP_ERR(edev, "Tx queue[%u] is stuck,"
                                          "requesting MCP to drain\n",
                                          txq->queue_id);
                                rc = qdev->ops->common->drain(edev);
@@ -1351,13 +1750,11 @@ static int qede_drain_txq(struct qede_dev *qdev,
                                        return rc;
                                return qede_drain_txq(qdev, txq, false);
                        }
-
-                       DP_NOTICE(edev, false,
-                                 "Timeout waiting for tx queue[%d]:"
+                       DP_ERR(edev, "Timeout waiting for tx queue[%d]:"
                                  "PROD=%d, CONS=%d\n",
                                  txq->queue_id, txq->sw_tx_prod,
                                  txq->sw_tx_cons);
-                       return -ENODEV;
+                       return -1;
                }
                cnt--;
                DELAY(1000);
@@ -1374,6 +1771,8 @@ static int qede_stop_queues(struct qede_dev *qdev)
 {
        struct qed_update_vport_params vport_update_params;
        struct ecore_dev *edev = &qdev->edev;
+       struct ecore_sge_tpa_params tpa_params;
+       struct qede_fastpath *fp;
        int rc, tc, i;
 
        /* Disable the vport */
@@ -1382,9 +1781,15 @@ static int qede_stop_queues(struct qede_dev *qdev)
        vport_update_params.update_vport_active_flg = 1;
        vport_update_params.vport_active_flg = 0;
        vport_update_params.update_rss_flg = 0;
+       /* Disable TPA */
+       if (qdev->enable_lro) {
+               DP_INFO(edev, "Disabling LRO\n");
+               memset(&tpa_params, 0, sizeof(struct ecore_sge_tpa_params));
+               qede_update_sge_tpa_params(&tpa_params, qdev->mtu, false);
+               vport_update_params.sge_tpa_params = &tpa_params;
+       }
 
        DP_INFO(edev, "Deactivate vport\n");
-
        rc = qdev->ops->vport_update(edev, &vport_update_params);
        if (rc) {
                DP_ERR(edev, "Failed to update vport\n");
@@ -1395,7 +1800,7 @@ static int qede_stop_queues(struct qede_dev *qdev)
 
        /* Flush Tx queues. If needed, request drain from MCP */
        for_each_queue(i) {
-               struct qede_fastpath *fp = &qdev->fp_array[i];
+               fp = &qdev->fp_array[i];
 
                if (fp->type & QEDE_FASTPATH_TX) {
                        for (tc = 0; tc < qdev->num_tc; tc++) {
@@ -1410,23 +1815,17 @@ static int qede_stop_queues(struct qede_dev *qdev)
 
        /* Stop all Queues in reverse order */
        for (i = QEDE_QUEUE_CNT(qdev) - 1; i >= 0; i--) {
-               struct qed_stop_rxq_params rx_params;
+               fp = &qdev->fp_array[i];
 
                /* Stop the Tx Queue(s) */
                if (qdev->fp_array[i].type & QEDE_FASTPATH_TX) {
                        for (tc = 0; tc < qdev->num_tc; tc++) {
-                               struct qed_stop_txq_params tx_params;
-                               u8 val;
-
-                               tx_params.rss_id = i;
-                               val = qdev->fp_array[i].txqs[tc]->queue_id;
-                               tx_params.tx_queue_id = val;
-
+                               struct qede_tx_queue *txq = fp->txqs[tc];
                                DP_INFO(edev, "Stopping tx queues\n");
-                               rc = qdev->ops->q_tx_stop(edev, &tx_params);
+                               rc = qdev->ops->q_tx_stop(edev, i, txq->handle);
                                if (rc) {
                                        DP_ERR(edev, "Failed to stop TXQ #%d\n",
-                                              tx_params.tx_queue_id);
+                                              i);
                                        return rc;
                                }
                        }
@@ -1434,20 +1833,15 @@ static int qede_stop_queues(struct qede_dev *qdev)
 
                /* Stop the Rx Queue */
                if (qdev->fp_array[i].type & QEDE_FASTPATH_RX) {
-                       memset(&rx_params, 0, sizeof(rx_params));
-                       rx_params.rss_id = i;
-                       rx_params.rx_queue_id = qdev->fp_array[i].rxq->queue_id;
-                       rx_params.eq_completion_only = 1;
-
                        DP_INFO(edev, "Stopping rx queues\n");
-
-                       rc = qdev->ops->q_rx_stop(edev, &rx_params);
+                       rc = qdev->ops->q_rx_stop(edev, i, fp->rxq->handle);
                        if (rc) {
                                DP_ERR(edev, "Failed to stop RXQ #%d\n", i);
                                return rc;
                        }
                }
        }
+       qede_reset_fp_rings(qdev);
 
        return 0;
 }
@@ -1506,10 +1900,14 @@ void qede_free_mem_load(struct rte_eth_dev *eth_dev)
        for_each_queue(id) {
                fp = &qdev->fp_array[id];
                if (fp->type & QEDE_FASTPATH_RX) {
+                       if (!fp->rxq)
+                               continue;
                        qede_rx_queue_release(fp->rxq);
                        eth_dev->data->rx_queues[id] = NULL;
                } else {
                        for (tc = 0; tc < qdev->num_tc; tc++) {
+                               if (!fp->txqs[tc])
+                                       continue;
                                txq_idx = fp->txqs[tc]->queue_id;
                                qede_tx_queue_release(fp->txqs[tc]);
                                eth_dev->data->tx_queues[txq_idx] = NULL;
@@ -1544,3 +1942,11 @@ void qede_dev_stop(struct rte_eth_dev *eth_dev)
 
        DP_INFO(edev, "dev_state is QEDE_DEV_STOP\n");
 }
+
+uint16_t
+qede_rxtx_pkts_dummy(__rte_unused void *p_rxq,
+                    __rte_unused struct rte_mbuf **pkts,
+                    __rte_unused uint16_t nb_pkts)
+{
+       return 0;
+}