net/txgbe: support PTP
[dpdk.git] / drivers / net / txgbe / txgbe_rxtx.c
index fd5708c..be48392 100644 (file)
@@ -8,7 +8,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <inttypes.h>
 
+#include <rte_byteorder.h>
 #include <rte_common.h>
 #include <rte_cycles.h>
 #include <rte_log.h>
 #include <rte_ethdev.h>
 #include <rte_ethdev_driver.h>
 #include <rte_memzone.h>
+#include <rte_atomic.h>
 #include <rte_mempool.h>
 #include <rte_malloc.h>
 #include <rte_mbuf.h>
+#include <rte_ether.h>
+#include <rte_prefetch.h>
+#include <rte_udp.h>
+#include <rte_tcp.h>
+#include <rte_sctp.h>
+#include <rte_string_fns.h>
+#include <rte_errno.h>
 #include <rte_ip.h>
 #include <rte_net.h>
 
 #include "txgbe_ethdev.h"
 #include "txgbe_rxtx.h"
 
+#ifdef RTE_LIBRTE_IEEE1588
+#define TXGBE_TX_IEEE1588_TMST PKT_TX_IEEE1588_TMST
+#else
+#define TXGBE_TX_IEEE1588_TMST 0
+#endif
+
 /* Bit Mask to indicate what bits required for building TX context */
 static const u64 TXGBE_TX_OFFLOAD_MASK = (PKT_TX_IP_CKSUM |
                PKT_TX_OUTER_IPV6 |
@@ -37,11 +56,17 @@ static const u64 TXGBE_TX_OFFLOAD_MASK = (PKT_TX_IP_CKSUM |
                PKT_TX_L4_MASK |
                PKT_TX_TCP_SEG |
                PKT_TX_TUNNEL_MASK |
-               PKT_TX_OUTER_IP_CKSUM);
+               PKT_TX_OUTER_IP_CKSUM |
+               TXGBE_TX_IEEE1588_TMST);
 
 #define TXGBE_TX_OFFLOAD_NOTSUP_MASK \
                (PKT_TX_OFFLOAD_MASK ^ TXGBE_TX_OFFLOAD_MASK)
 
+/*
+ * Prefetch a cache line into all cache levels.
+ */
+#define rte_txgbe_prefetch(p)   rte_prefetch0(p)
+
 static int
 txgbe_is_vf(struct rte_eth_dev *dev)
 {
@@ -833,6 +858,11 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                 */
                cmd_type_len = TXGBE_TXD_FCS;
 
+#ifdef RTE_LIBRTE_IEEE1588
+               if (ol_flags & PKT_TX_IEEE1588_TMST)
+                       cmd_type_len |= TXGBE_TXD_1588;
+#endif
+
                olinfo_status = 0;
                if (tx_ol_req) {
                        if (ol_flags & PKT_TX_TCP_SEG) {
@@ -985,6 +1015,878 @@ txgbe_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        return i;
 }
 
+/*********************************************************************
+ *
+ *  RX functions
+ *
+ **********************************************************************/
+/* @note: fix txgbe_dev_supported_ptypes_get() if any change here. */
+static inline uint32_t
+txgbe_rxd_pkt_info_to_pkt_type(uint32_t pkt_info, uint16_t ptid_mask)
+{
+       uint16_t ptid = TXGBE_RXD_PTID(pkt_info);
+
+       ptid &= ptid_mask;
+
+       return txgbe_decode_ptype(ptid);
+}
+
+static inline uint64_t
+txgbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)
+{
+       static uint64_t ip_rss_types_map[16] __rte_cache_aligned = {
+               0, PKT_RX_RSS_HASH, PKT_RX_RSS_HASH, PKT_RX_RSS_HASH,
+               0, PKT_RX_RSS_HASH, 0, PKT_RX_RSS_HASH,
+               PKT_RX_RSS_HASH, 0, 0, 0,
+               0, 0, 0,  PKT_RX_FDIR,
+       };
+#ifdef RTE_LIBRTE_IEEE1588
+       static uint64_t ip_pkt_etqf_map[8] = {
+               0, 0, 0, PKT_RX_IEEE1588_PTP,
+               0, 0, 0, 0,
+       };
+       int etfid = txgbe_etflt_id(TXGBE_RXD_PTID(pkt_info));
+       if (likely(-1 != etfid))
+               return ip_pkt_etqf_map[etfid] |
+                      ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];
+       else
+               return ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];
+#else
+       return ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];
+#endif
+}
+
+static inline uint64_t
+rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t vlan_flags)
+{
+       uint64_t pkt_flags;
+
+       /*
+        * Check if VLAN present only.
+        * Do not check whether L3/L4 rx checksum done by NIC or not,
+        * That can be found from rte_eth_rxmode.offloads flag
+        */
+       pkt_flags = (rx_status & TXGBE_RXD_STAT_VLAN &&
+                    vlan_flags & PKT_RX_VLAN_STRIPPED)
+                   ? vlan_flags : 0;
+
+#ifdef RTE_LIBRTE_IEEE1588
+       if (rx_status & TXGBE_RXD_STAT_1588)
+               pkt_flags = pkt_flags | PKT_RX_IEEE1588_TMST;
+#endif
+       return pkt_flags;
+}
+
+static inline uint64_t
+rx_desc_error_to_pkt_flags(uint32_t rx_status)
+{
+       uint64_t pkt_flags = 0;
+
+       /* checksum offload can't be disabled */
+       if (rx_status & TXGBE_RXD_STAT_IPCS) {
+               pkt_flags |= (rx_status & TXGBE_RXD_ERR_IPCS
+                               ? PKT_RX_IP_CKSUM_BAD : PKT_RX_IP_CKSUM_GOOD);
+       }
+
+       if (rx_status & TXGBE_RXD_STAT_L4CS) {
+               pkt_flags |= (rx_status & TXGBE_RXD_ERR_L4CS
+                               ? PKT_RX_L4_CKSUM_BAD : PKT_RX_L4_CKSUM_GOOD);
+       }
+
+       if (rx_status & TXGBE_RXD_STAT_EIPCS &&
+           rx_status & TXGBE_RXD_ERR_EIPCS) {
+               pkt_flags |= PKT_RX_EIP_CKSUM_BAD;
+       }
+
+       return pkt_flags;
+}
+
+/*
+ * LOOK_AHEAD defines how many desc statuses to check beyond the
+ * current descriptor.
+ * It must be a pound define for optimal performance.
+ * Do not change the value of LOOK_AHEAD, as the txgbe_rx_scan_hw_ring
+ * function only works with LOOK_AHEAD=8.
+ */
+#define LOOK_AHEAD 8
+#if (LOOK_AHEAD != 8)
+#error "PMD TXGBE: LOOK_AHEAD must be 8\n"
+#endif
+static inline int
+txgbe_rx_scan_hw_ring(struct txgbe_rx_queue *rxq)
+{
+       volatile struct txgbe_rx_desc *rxdp;
+       struct txgbe_rx_entry *rxep;
+       struct rte_mbuf *mb;
+       uint16_t pkt_len;
+       uint64_t pkt_flags;
+       int nb_dd;
+       uint32_t s[LOOK_AHEAD];
+       uint32_t pkt_info[LOOK_AHEAD];
+       int i, j, nb_rx = 0;
+       uint32_t status;
+
+       /* get references to current descriptor and S/W ring entry */
+       rxdp = &rxq->rx_ring[rxq->rx_tail];
+       rxep = &rxq->sw_ring[rxq->rx_tail];
+
+       status = rxdp->qw1.lo.status;
+       /* check to make sure there is at least 1 packet to receive */
+       if (!(status & rte_cpu_to_le_32(TXGBE_RXD_STAT_DD)))
+               return 0;
+
+       /*
+        * Scan LOOK_AHEAD descriptors at a time to determine which descriptors
+        * reference packets that are ready to be received.
+        */
+       for (i = 0; i < RTE_PMD_TXGBE_RX_MAX_BURST;
+            i += LOOK_AHEAD, rxdp += LOOK_AHEAD, rxep += LOOK_AHEAD) {
+               /* Read desc statuses backwards to avoid race condition */
+               for (j = 0; j < LOOK_AHEAD; j++)
+                       s[j] = rte_le_to_cpu_32(rxdp[j].qw1.lo.status);
+
+               rte_smp_rmb();
+
+               /* Compute how many status bits were set */
+               for (nb_dd = 0; nb_dd < LOOK_AHEAD &&
+                               (s[nb_dd] & TXGBE_RXD_STAT_DD); nb_dd++)
+                       ;
+
+               for (j = 0; j < nb_dd; j++)
+                       pkt_info[j] = rte_le_to_cpu_32(rxdp[j].qw0.dw0);
+
+               nb_rx += nb_dd;
+
+               /* Translate descriptor info to mbuf format */
+               for (j = 0; j < nb_dd; ++j) {
+                       mb = rxep[j].mbuf;
+                       pkt_len = rte_le_to_cpu_16(rxdp[j].qw1.hi.len) -
+                                 rxq->crc_len;
+                       mb->data_len = pkt_len;
+                       mb->pkt_len = pkt_len;
+                       mb->vlan_tci = rte_le_to_cpu_16(rxdp[j].qw1.hi.tag);
+
+                       /* convert descriptor fields to rte mbuf flags */
+                       pkt_flags = rx_desc_status_to_pkt_flags(s[j],
+                                       rxq->vlan_flags);
+                       pkt_flags |= rx_desc_error_to_pkt_flags(s[j]);
+                       pkt_flags |=
+                               txgbe_rxd_pkt_info_to_pkt_flags(pkt_info[j]);
+                       mb->ol_flags = pkt_flags;
+                       mb->packet_type =
+                               txgbe_rxd_pkt_info_to_pkt_type(pkt_info[j],
+                               rxq->pkt_type_mask);
+
+                       if (likely(pkt_flags & PKT_RX_RSS_HASH))
+                               mb->hash.rss =
+                                       rte_le_to_cpu_32(rxdp[j].qw0.dw1);
+                       else if (pkt_flags & PKT_RX_FDIR) {
+                               mb->hash.fdir.hash =
+                                       rte_le_to_cpu_16(rxdp[j].qw0.hi.csum) &
+                                       TXGBE_ATR_HASH_MASK;
+                               mb->hash.fdir.id =
+                                       rte_le_to_cpu_16(rxdp[j].qw0.hi.ipid);
+                       }
+               }
+
+               /* Move mbuf pointers from the S/W ring to the stage */
+               for (j = 0; j < LOOK_AHEAD; ++j)
+                       rxq->rx_stage[i + j] = rxep[j].mbuf;
+
+               /* stop if all requested packets could not be received */
+               if (nb_dd != LOOK_AHEAD)
+                       break;
+       }
+
+       /* clear software ring entries so we can cleanup correctly */
+       for (i = 0; i < nb_rx; ++i)
+               rxq->sw_ring[rxq->rx_tail + i].mbuf = NULL;
+
+       return nb_rx;
+}
+
+static inline int
+txgbe_rx_alloc_bufs(struct txgbe_rx_queue *rxq, bool reset_mbuf)
+{
+       volatile struct txgbe_rx_desc *rxdp;
+       struct txgbe_rx_entry *rxep;
+       struct rte_mbuf *mb;
+       uint16_t alloc_idx;
+       __le64 dma_addr;
+       int diag, i;
+
+       /* allocate buffers in bulk directly into the S/W ring */
+       alloc_idx = rxq->rx_free_trigger - (rxq->rx_free_thresh - 1);
+       rxep = &rxq->sw_ring[alloc_idx];
+       diag = rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,
+                                   rxq->rx_free_thresh);
+       if (unlikely(diag != 0))
+               return -ENOMEM;
+
+       rxdp = &rxq->rx_ring[alloc_idx];
+       for (i = 0; i < rxq->rx_free_thresh; ++i) {
+               /* populate the static rte mbuf fields */
+               mb = rxep[i].mbuf;
+               if (reset_mbuf)
+                       mb->port = rxq->port_id;
+
+               rte_mbuf_refcnt_set(mb, 1);
+               mb->data_off = RTE_PKTMBUF_HEADROOM;
+
+               /* populate the descriptors */
+               dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(mb));
+               TXGBE_RXD_HDRADDR(&rxdp[i], 0);
+               TXGBE_RXD_PKTADDR(&rxdp[i], dma_addr);
+       }
+
+       /* update state of internal queue structure */
+       rxq->rx_free_trigger = rxq->rx_free_trigger + rxq->rx_free_thresh;
+       if (rxq->rx_free_trigger >= rxq->nb_rx_desc)
+               rxq->rx_free_trigger = rxq->rx_free_thresh - 1;
+
+       /* no errors */
+       return 0;
+}
+
+static inline uint16_t
+txgbe_rx_fill_from_stage(struct txgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
+                        uint16_t nb_pkts)
+{
+       struct rte_mbuf **stage = &rxq->rx_stage[rxq->rx_next_avail];
+       int i;
+
+       /* how many packets are ready to return? */
+       nb_pkts = (uint16_t)RTE_MIN(nb_pkts, rxq->rx_nb_avail);
+
+       /* copy mbuf pointers to the application's packet list */
+       for (i = 0; i < nb_pkts; ++i)
+               rx_pkts[i] = stage[i];
+
+       /* update internal queue state */
+       rxq->rx_nb_avail = (uint16_t)(rxq->rx_nb_avail - nb_pkts);
+       rxq->rx_next_avail = (uint16_t)(rxq->rx_next_avail + nb_pkts);
+
+       return nb_pkts;
+}
+
+static inline uint16_t
+txgbe_rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+            uint16_t nb_pkts)
+{
+       struct txgbe_rx_queue *rxq = (struct txgbe_rx_queue *)rx_queue;
+       struct rte_eth_dev *dev = &rte_eth_devices[rxq->port_id];
+       uint16_t nb_rx = 0;
+
+       /* Any previously recv'd pkts will be returned from the Rx stage */
+       if (rxq->rx_nb_avail)
+               return txgbe_rx_fill_from_stage(rxq, rx_pkts, nb_pkts);
+
+       /* Scan the H/W ring for packets to receive */
+       nb_rx = (uint16_t)txgbe_rx_scan_hw_ring(rxq);
+
+       /* update internal queue state */
+       rxq->rx_next_avail = 0;
+       rxq->rx_nb_avail = nb_rx;
+       rxq->rx_tail = (uint16_t)(rxq->rx_tail + nb_rx);
+
+       /* if required, allocate new buffers to replenish descriptors */
+       if (rxq->rx_tail > rxq->rx_free_trigger) {
+               uint16_t cur_free_trigger = rxq->rx_free_trigger;
+
+               if (txgbe_rx_alloc_bufs(rxq, true) != 0) {
+                       int i, j;
+
+                       PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+                                  "queue_id=%u", (uint16_t)rxq->port_id,
+                                  (uint16_t)rxq->queue_id);
+
+                       dev->data->rx_mbuf_alloc_failed +=
+                               rxq->rx_free_thresh;
+
+                       /*
+                        * Need to rewind any previous receives if we cannot
+                        * allocate new buffers to replenish the old ones.
+                        */
+                       rxq->rx_nb_avail = 0;
+                       rxq->rx_tail = (uint16_t)(rxq->rx_tail - nb_rx);
+                       for (i = 0, j = rxq->rx_tail; i < nb_rx; ++i, ++j)
+                               rxq->sw_ring[j].mbuf = rxq->rx_stage[i];
+
+                       return 0;
+               }
+
+               /* update tail pointer */
+               rte_wmb();
+               txgbe_set32_relaxed(rxq->rdt_reg_addr, cur_free_trigger);
+       }
+
+       if (rxq->rx_tail >= rxq->nb_rx_desc)
+               rxq->rx_tail = 0;
+
+       /* received any packets this loop? */
+       if (rxq->rx_nb_avail)
+               return txgbe_rx_fill_from_stage(rxq, rx_pkts, nb_pkts);
+
+       return 0;
+}
+
+/* split requests into chunks of size RTE_PMD_TXGBE_RX_MAX_BURST */
+uint16_t
+txgbe_recv_pkts_bulk_alloc(void *rx_queue, struct rte_mbuf **rx_pkts,
+                          uint16_t nb_pkts)
+{
+       uint16_t nb_rx;
+
+       if (unlikely(nb_pkts == 0))
+               return 0;
+
+       if (likely(nb_pkts <= RTE_PMD_TXGBE_RX_MAX_BURST))
+               return txgbe_rx_recv_pkts(rx_queue, rx_pkts, nb_pkts);
+
+       /* request is relatively large, chunk it up */
+       nb_rx = 0;
+       while (nb_pkts) {
+               uint16_t ret, n;
+
+               n = (uint16_t)RTE_MIN(nb_pkts, RTE_PMD_TXGBE_RX_MAX_BURST);
+               ret = txgbe_rx_recv_pkts(rx_queue, &rx_pkts[nb_rx], n);
+               nb_rx = (uint16_t)(nb_rx + ret);
+               nb_pkts = (uint16_t)(nb_pkts - ret);
+               if (ret < n)
+                       break;
+       }
+
+       return nb_rx;
+}
+
+uint16_t
+txgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+               uint16_t nb_pkts)
+{
+       struct txgbe_rx_queue *rxq;
+       volatile struct txgbe_rx_desc *rx_ring;
+       volatile struct txgbe_rx_desc *rxdp;
+       struct txgbe_rx_entry *sw_ring;
+       struct txgbe_rx_entry *rxe;
+       struct rte_mbuf *rxm;
+       struct rte_mbuf *nmb;
+       struct txgbe_rx_desc rxd;
+       uint64_t dma_addr;
+       uint32_t staterr;
+       uint32_t pkt_info;
+       uint16_t pkt_len;
+       uint16_t rx_id;
+       uint16_t nb_rx;
+       uint16_t nb_hold;
+       uint64_t pkt_flags;
+
+       nb_rx = 0;
+       nb_hold = 0;
+       rxq = rx_queue;
+       rx_id = rxq->rx_tail;
+       rx_ring = rxq->rx_ring;
+       sw_ring = rxq->sw_ring;
+       struct rte_eth_dev *dev = &rte_eth_devices[rxq->port_id];
+       while (nb_rx < nb_pkts) {
+               /*
+                * The order of operations here is important as the DD status
+                * bit must not be read after any other descriptor fields.
+                * rx_ring and rxdp are pointing to volatile data so the order
+                * of accesses cannot be reordered by the compiler. If they were
+                * not volatile, they could be reordered which could lead to
+                * using invalid descriptor fields when read from rxd.
+                */
+               rxdp = &rx_ring[rx_id];
+               staterr = rxdp->qw1.lo.status;
+               if (!(staterr & rte_cpu_to_le_32(TXGBE_RXD_STAT_DD)))
+                       break;
+               rxd = *rxdp;
+
+               /*
+                * End of packet.
+                *
+                * If the TXGBE_RXD_STAT_EOP flag is not set, the RX packet
+                * is likely to be invalid and to be dropped by the various
+                * validation checks performed by the network stack.
+                *
+                * Allocate a new mbuf to replenish the RX ring descriptor.
+                * If the allocation fails:
+                *    - arrange for that RX descriptor to be the first one
+                *      being parsed the next time the receive function is
+                *      invoked [on the same queue].
+                *
+                *    - Stop parsing the RX ring and return immediately.
+                *
+                * This policy do not drop the packet received in the RX
+                * descriptor for which the allocation of a new mbuf failed.
+                * Thus, it allows that packet to be later retrieved if
+                * mbuf have been freed in the mean time.
+                * As a side effect, holding RX descriptors instead of
+                * systematically giving them back to the NIC may lead to
+                * RX ring exhaustion situations.
+                * However, the NIC can gracefully prevent such situations
+                * to happen by sending specific "back-pressure" flow control
+                * frames to its peer(s).
+                */
+               PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_id=%u "
+                          "ext_err_stat=0x%08x pkt_len=%u",
+                          (uint16_t)rxq->port_id, (uint16_t)rxq->queue_id,
+                          (uint16_t)rx_id, (uint32_t)staterr,
+                          (uint16_t)rte_le_to_cpu_16(rxd.qw1.hi.len));
+
+               nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
+               if (nmb == NULL) {
+                       PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+                                  "queue_id=%u", (uint16_t)rxq->port_id,
+                                  (uint16_t)rxq->queue_id);
+                       dev->data->rx_mbuf_alloc_failed++;
+                       break;
+               }
+
+               nb_hold++;
+               rxe = &sw_ring[rx_id];
+               rx_id++;
+               if (rx_id == rxq->nb_rx_desc)
+                       rx_id = 0;
+
+               /* Prefetch next mbuf while processing current one. */
+               rte_txgbe_prefetch(sw_ring[rx_id].mbuf);
+
+               /*
+                * When next RX descriptor is on a cache-line boundary,
+                * prefetch the next 4 RX descriptors and the next 8 pointers
+                * to mbufs.
+                */
+               if ((rx_id & 0x3) == 0) {
+                       rte_txgbe_prefetch(&rx_ring[rx_id]);
+                       rte_txgbe_prefetch(&sw_ring[rx_id]);
+               }
+
+               rxm = rxe->mbuf;
+               rxe->mbuf = nmb;
+               dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb));
+               TXGBE_RXD_HDRADDR(rxdp, 0);
+               TXGBE_RXD_PKTADDR(rxdp, dma_addr);
+
+               /*
+                * Initialize the returned mbuf.
+                * 1) setup generic mbuf fields:
+                *    - number of segments,
+                *    - next segment,
+                *    - packet length,
+                *    - RX port identifier.
+                * 2) integrate hardware offload data, if any:
+                *    - RSS flag & hash,
+                *    - IP checksum flag,
+                *    - VLAN TCI, if any,
+                *    - error flags.
+                */
+               pkt_len = (uint16_t)(rte_le_to_cpu_16(rxd.qw1.hi.len) -
+                                     rxq->crc_len);
+               rxm->data_off = RTE_PKTMBUF_HEADROOM;
+               rte_packet_prefetch((char *)rxm->buf_addr + rxm->data_off);
+               rxm->nb_segs = 1;
+               rxm->next = NULL;
+               rxm->pkt_len = pkt_len;
+               rxm->data_len = pkt_len;
+               rxm->port = rxq->port_id;
+
+               pkt_info = rte_le_to_cpu_32(rxd.qw0.dw0);
+               /* Only valid if PKT_RX_VLAN set in pkt_flags */
+               rxm->vlan_tci = rte_le_to_cpu_16(rxd.qw1.hi.tag);
+
+               pkt_flags = rx_desc_status_to_pkt_flags(staterr,
+                                       rxq->vlan_flags);
+               pkt_flags |= rx_desc_error_to_pkt_flags(staterr);
+               pkt_flags |= txgbe_rxd_pkt_info_to_pkt_flags(pkt_info);
+               rxm->ol_flags = pkt_flags;
+               rxm->packet_type = txgbe_rxd_pkt_info_to_pkt_type(pkt_info,
+                                                      rxq->pkt_type_mask);
+
+               if (likely(pkt_flags & PKT_RX_RSS_HASH)) {
+                       rxm->hash.rss = rte_le_to_cpu_32(rxd.qw0.dw1);
+               } else if (pkt_flags & PKT_RX_FDIR) {
+                       rxm->hash.fdir.hash =
+                               rte_le_to_cpu_16(rxd.qw0.hi.csum) &
+                               TXGBE_ATR_HASH_MASK;
+                       rxm->hash.fdir.id = rte_le_to_cpu_16(rxd.qw0.hi.ipid);
+               }
+               /*
+                * Store the mbuf address into the next entry of the array
+                * of returned packets.
+                */
+               rx_pkts[nb_rx++] = rxm;
+       }
+       rxq->rx_tail = rx_id;
+
+       /*
+        * If the number of free RX descriptors is greater than the RX free
+        * threshold of the queue, advance the Receive Descriptor Tail (RDT)
+        * register.
+        * Update the RDT with the value of the last processed RX descriptor
+        * minus 1, to guarantee that the RDT register is never equal to the
+        * RDH register, which creates a "full" ring situation from the
+        * hardware point of view...
+        */
+       nb_hold = (uint16_t)(nb_hold + rxq->nb_rx_hold);
+       if (nb_hold > rxq->rx_free_thresh) {
+               PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+                          "nb_hold=%u nb_rx=%u",
+                          (uint16_t)rxq->port_id, (uint16_t)rxq->queue_id,
+                          (uint16_t)rx_id, (uint16_t)nb_hold,
+                          (uint16_t)nb_rx);
+               rx_id = (uint16_t)((rx_id == 0) ?
+                               (rxq->nb_rx_desc - 1) : (rx_id - 1));
+               txgbe_set32(rxq->rdt_reg_addr, rx_id);
+               nb_hold = 0;
+       }
+       rxq->nb_rx_hold = nb_hold;
+       return nb_rx;
+}
+
+/**
+ * txgbe_fill_cluster_head_buf - fill the first mbuf of the returned packet
+ *
+ * Fill the following info in the HEAD buffer of the Rx cluster:
+ *    - RX port identifier
+ *    - hardware offload data, if any:
+ *      - RSS flag & hash
+ *      - IP checksum flag
+ *      - VLAN TCI, if any
+ *      - error flags
+ * @head HEAD of the packet cluster
+ * @desc HW descriptor to get data from
+ * @rxq Pointer to the Rx queue
+ */
+static inline void
+txgbe_fill_cluster_head_buf(struct rte_mbuf *head, struct txgbe_rx_desc *desc,
+               struct txgbe_rx_queue *rxq, uint32_t staterr)
+{
+       uint32_t pkt_info;
+       uint64_t pkt_flags;
+
+       head->port = rxq->port_id;
+
+       /* The vlan_tci field is only valid when PKT_RX_VLAN is
+        * set in the pkt_flags field.
+        */
+       head->vlan_tci = rte_le_to_cpu_16(desc->qw1.hi.tag);
+       pkt_info = rte_le_to_cpu_32(desc->qw0.dw0);
+       pkt_flags = rx_desc_status_to_pkt_flags(staterr, rxq->vlan_flags);
+       pkt_flags |= rx_desc_error_to_pkt_flags(staterr);
+       pkt_flags |= txgbe_rxd_pkt_info_to_pkt_flags(pkt_info);
+       head->ol_flags = pkt_flags;
+       head->packet_type = txgbe_rxd_pkt_info_to_pkt_type(pkt_info,
+                                               rxq->pkt_type_mask);
+
+       if (likely(pkt_flags & PKT_RX_RSS_HASH)) {
+               head->hash.rss = rte_le_to_cpu_32(desc->qw0.dw1);
+       } else if (pkt_flags & PKT_RX_FDIR) {
+               head->hash.fdir.hash = rte_le_to_cpu_16(desc->qw0.hi.csum)
+                               & TXGBE_ATR_HASH_MASK;
+               head->hash.fdir.id = rte_le_to_cpu_16(desc->qw0.hi.ipid);
+       }
+}
+
+/**
+ * txgbe_recv_pkts_lro - receive handler for and LRO case.
+ *
+ * @rx_queue Rx queue handle
+ * @rx_pkts table of received packets
+ * @nb_pkts size of rx_pkts table
+ * @bulk_alloc if TRUE bulk allocation is used for a HW ring refilling
+ *
+ * Handles the Rx HW ring completions when RSC feature is configured. Uses an
+ * additional ring of txgbe_rsc_entry's that will hold the relevant RSC info.
+ *
+ * We use the same logic as in Linux and in FreeBSD txgbe drivers:
+ * 1) When non-EOP RSC completion arrives:
+ *    a) Update the HEAD of the current RSC aggregation cluster with the new
+ *       segment's data length.
+ *    b) Set the "next" pointer of the current segment to point to the segment
+ *       at the NEXTP index.
+ *    c) Pass the HEAD of RSC aggregation cluster on to the next NEXTP entry
+ *       in the sw_rsc_ring.
+ * 2) When EOP arrives we just update the cluster's total length and offload
+ *    flags and deliver the cluster up to the upper layers. In our case - put it
+ *    in the rx_pkts table.
+ *
+ * Returns the number of received packets/clusters (according to the "bulk
+ * receive" interface).
+ */
+static inline uint16_t
+txgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts,
+                   bool bulk_alloc)
+{
+       struct txgbe_rx_queue *rxq = rx_queue;
+       struct rte_eth_dev *dev = &rte_eth_devices[rxq->port_id];
+       volatile struct txgbe_rx_desc *rx_ring = rxq->rx_ring;
+       struct txgbe_rx_entry *sw_ring = rxq->sw_ring;
+       struct txgbe_scattered_rx_entry *sw_sc_ring = rxq->sw_sc_ring;
+       uint16_t rx_id = rxq->rx_tail;
+       uint16_t nb_rx = 0;
+       uint16_t nb_hold = rxq->nb_rx_hold;
+       uint16_t prev_id = rxq->rx_tail;
+
+       while (nb_rx < nb_pkts) {
+               bool eop;
+               struct txgbe_rx_entry *rxe;
+               struct txgbe_scattered_rx_entry *sc_entry;
+               struct txgbe_scattered_rx_entry *next_sc_entry = NULL;
+               struct txgbe_rx_entry *next_rxe = NULL;
+               struct rte_mbuf *first_seg;
+               struct rte_mbuf *rxm;
+               struct rte_mbuf *nmb = NULL;
+               struct txgbe_rx_desc rxd;
+               uint16_t data_len;
+               uint16_t next_id;
+               volatile struct txgbe_rx_desc *rxdp;
+               uint32_t staterr;
+
+next_desc:
+               /*
+                * The code in this whole file uses the volatile pointer to
+                * ensure the read ordering of the status and the rest of the
+                * descriptor fields (on the compiler level only!!!). This is so
+                * UGLY - why not to just use the compiler barrier instead? DPDK
+                * even has the rte_compiler_barrier() for that.
+                *
+                * But most importantly this is just wrong because this doesn't
+                * ensure memory ordering in a general case at all. For
+                * instance, DPDK is supposed to work on Power CPUs where
+                * compiler barrier may just not be enough!
+                *
+                * I tried to write only this function properly to have a
+                * starting point (as a part of an LRO/RSC series) but the
+                * compiler cursed at me when I tried to cast away the
+                * "volatile" from rx_ring (yes, it's volatile too!!!). So, I'm
+                * keeping it the way it is for now.
+                *
+                * The code in this file is broken in so many other places and
+                * will just not work on a big endian CPU anyway therefore the
+                * lines below will have to be revisited together with the rest
+                * of the txgbe PMD.
+                *
+                * TODO:
+                *    - Get rid of "volatile" and let the compiler do its job.
+                *    - Use the proper memory barrier (rte_rmb()) to ensure the
+                *      memory ordering below.
+                */
+               rxdp = &rx_ring[rx_id];
+               staterr = rte_le_to_cpu_32(rxdp->qw1.lo.status);
+
+               if (!(staterr & TXGBE_RXD_STAT_DD))
+                       break;
+
+               rxd = *rxdp;
+
+               PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_id=%u "
+                                 "staterr=0x%x data_len=%u",
+                          rxq->port_id, rxq->queue_id, rx_id, staterr,
+                          rte_le_to_cpu_16(rxd.qw1.hi.len));
+
+               if (!bulk_alloc) {
+                       nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
+                       if (nmb == NULL) {
+                               PMD_RX_LOG(DEBUG, "RX mbuf alloc failed "
+                                                 "port_id=%u queue_id=%u",
+                                          rxq->port_id, rxq->queue_id);
+
+                               dev->data->rx_mbuf_alloc_failed++;
+                               break;
+                       }
+               } else if (nb_hold > rxq->rx_free_thresh) {
+                       uint16_t next_rdt = rxq->rx_free_trigger;
+
+                       if (!txgbe_rx_alloc_bufs(rxq, false)) {
+                               rte_wmb();
+                               txgbe_set32_relaxed(rxq->rdt_reg_addr,
+                                                           next_rdt);
+                               nb_hold -= rxq->rx_free_thresh;
+                       } else {
+                               PMD_RX_LOG(DEBUG, "RX bulk alloc failed "
+                                                 "port_id=%u queue_id=%u",
+                                          rxq->port_id, rxq->queue_id);
+
+                               dev->data->rx_mbuf_alloc_failed++;
+                               break;
+                       }
+               }
+
+               nb_hold++;
+               rxe = &sw_ring[rx_id];
+               eop = staterr & TXGBE_RXD_STAT_EOP;
+
+               next_id = rx_id + 1;
+               if (next_id == rxq->nb_rx_desc)
+                       next_id = 0;
+
+               /* Prefetch next mbuf while processing current one. */
+               rte_txgbe_prefetch(sw_ring[next_id].mbuf);
+
+               /*
+                * When next RX descriptor is on a cache-line boundary,
+                * prefetch the next 4 RX descriptors and the next 4 pointers
+                * to mbufs.
+                */
+               if ((next_id & 0x3) == 0) {
+                       rte_txgbe_prefetch(&rx_ring[next_id]);
+                       rte_txgbe_prefetch(&sw_ring[next_id]);
+               }
+
+               rxm = rxe->mbuf;
+
+               if (!bulk_alloc) {
+                       __le64 dma =
+                         rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb));
+                       /*
+                        * Update RX descriptor with the physical address of the
+                        * new data buffer of the new allocated mbuf.
+                        */
+                       rxe->mbuf = nmb;
+
+                       rxm->data_off = RTE_PKTMBUF_HEADROOM;
+                       TXGBE_RXD_HDRADDR(rxdp, 0);
+                       TXGBE_RXD_PKTADDR(rxdp, dma);
+               } else {
+                       rxe->mbuf = NULL;
+               }
+
+               /*
+                * Set data length & data buffer address of mbuf.
+                */
+               data_len = rte_le_to_cpu_16(rxd.qw1.hi.len);
+               rxm->data_len = data_len;
+
+               if (!eop) {
+                       uint16_t nextp_id;
+                       /*
+                        * Get next descriptor index:
+                        *  - For RSC it's in the NEXTP field.
+                        *  - For a scattered packet - it's just a following
+                        *    descriptor.
+                        */
+                       if (TXGBE_RXD_RSCCNT(rxd.qw0.dw0))
+                               nextp_id = TXGBE_RXD_NEXTP(staterr);
+                       else
+                               nextp_id = next_id;
+
+                       next_sc_entry = &sw_sc_ring[nextp_id];
+                       next_rxe = &sw_ring[nextp_id];
+                       rte_txgbe_prefetch(next_rxe);
+               }
+
+               sc_entry = &sw_sc_ring[rx_id];
+               first_seg = sc_entry->fbuf;
+               sc_entry->fbuf = NULL;
+
+               /*
+                * If this is the first buffer of the received packet,
+                * set the pointer to the first mbuf of the packet and
+                * initialize its context.
+                * Otherwise, update the total length and the number of segments
+                * of the current scattered packet, and update the pointer to
+                * the last mbuf of the current packet.
+                */
+               if (first_seg == NULL) {
+                       first_seg = rxm;
+                       first_seg->pkt_len = data_len;
+                       first_seg->nb_segs = 1;
+               } else {
+                       first_seg->pkt_len += data_len;
+                       first_seg->nb_segs++;
+               }
+
+               prev_id = rx_id;
+               rx_id = next_id;
+
+               /*
+                * If this is not the last buffer of the received packet, update
+                * the pointer to the first mbuf at the NEXTP entry in the
+                * sw_sc_ring and continue to parse the RX ring.
+                */
+               if (!eop && next_rxe) {
+                       rxm->next = next_rxe->mbuf;
+                       next_sc_entry->fbuf = first_seg;
+                       goto next_desc;
+               }
+
+               /* Initialize the first mbuf of the returned packet */
+               txgbe_fill_cluster_head_buf(first_seg, &rxd, rxq, staterr);
+
+               /*
+                * Deal with the case, when HW CRC srip is disabled.
+                * That can't happen when LRO is enabled, but still could
+                * happen for scattered RX mode.
+                */
+               first_seg->pkt_len -= rxq->crc_len;
+               if (unlikely(rxm->data_len <= rxq->crc_len)) {
+                       struct rte_mbuf *lp;
+
+                       for (lp = first_seg; lp->next != rxm; lp = lp->next)
+                               ;
+
+                       first_seg->nb_segs--;
+                       lp->data_len -= rxq->crc_len - rxm->data_len;
+                       lp->next = NULL;
+                       rte_pktmbuf_free_seg(rxm);
+               } else {
+                       rxm->data_len -= rxq->crc_len;
+               }
+
+               /* Prefetch data of first segment, if configured to do so. */
+               rte_packet_prefetch((char *)first_seg->buf_addr +
+                       first_seg->data_off);
+
+               /*
+                * Store the mbuf address into the next entry of the array
+                * of returned packets.
+                */
+               rx_pkts[nb_rx++] = first_seg;
+       }
+
+       /*
+        * Record index of the next RX descriptor to probe.
+        */
+       rxq->rx_tail = rx_id;
+
+       /*
+        * If the number of free RX descriptors is greater than the RX free
+        * threshold of the queue, advance the Receive Descriptor Tail (RDT)
+        * register.
+        * Update the RDT with the value of the last processed RX descriptor
+        * minus 1, to guarantee that the RDT register is never equal to the
+        * RDH register, which creates a "full" ring situation from the
+        * hardware point of view...
+        */
+       if (!bulk_alloc && nb_hold > rxq->rx_free_thresh) {
+               PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+                          "nb_hold=%u nb_rx=%u",
+                          rxq->port_id, rxq->queue_id, rx_id, nb_hold, nb_rx);
+
+               rte_wmb();
+               txgbe_set32_relaxed(rxq->rdt_reg_addr, prev_id);
+               nb_hold = 0;
+       }
+
+       rxq->nb_rx_hold = nb_hold;
+       return nb_rx;
+}
+
+uint16_t
+txgbe_recv_pkts_lro_single_alloc(void *rx_queue, struct rte_mbuf **rx_pkts,
+                                uint16_t nb_pkts)
+{
+       return txgbe_recv_pkts_lro(rx_queue, rx_pkts, nb_pkts, false);
+}
+
+uint16_t
+txgbe_recv_pkts_lro_bulk_alloc(void *rx_queue, struct rte_mbuf **rx_pkts,
+                              uint16_t nb_pkts)
+{
+       return txgbe_recv_pkts_lro(rx_queue, rx_pkts, nb_pkts, true);
+}
+
 uint64_t
 txgbe_get_rx_queue_offloads(struct rte_eth_dev *dev __rte_unused)
 {
@@ -1066,9 +1968,48 @@ txgbe_dev_tx_queue_release(void *txq)
        txgbe_tx_queue_release(txq);
 }
 
-static const struct txgbe_txq_ops def_txq_ops = {
+/* (Re)set dynamic txgbe_tx_queue fields to defaults */
+static void __rte_cold
+txgbe_reset_tx_queue(struct txgbe_tx_queue *txq)
+{
+       static const struct txgbe_tx_desc zeroed_desc = {0};
+       struct txgbe_tx_entry *txe = txq->sw_ring;
+       uint16_t prev, i;
+
+       /* Zero out HW ring memory */
+       for (i = 0; i < txq->nb_tx_desc; i++)
+               txq->tx_ring[i] = zeroed_desc;
+
+       /* Initialize SW ring entries */
+       prev = (uint16_t)(txq->nb_tx_desc - 1);
+       for (i = 0; i < txq->nb_tx_desc; i++) {
+               volatile struct txgbe_tx_desc *txd = &txq->tx_ring[i];
+
+               txd->dw3 = rte_cpu_to_le_32(TXGBE_TXD_DD);
+               txe[i].mbuf = NULL;
+               txe[i].last_id = i;
+               txe[prev].next_id = i;
+               prev = i;
+       }
+
+       txq->tx_next_dd = (uint16_t)(txq->tx_free_thresh - 1);
+       txq->tx_tail = 0;
+
+       /*
+        * Always allow 1 descriptor to be un-allocated to avoid
+        * a H/W race condition
+        */
+       txq->last_desc_cleaned = (uint16_t)(txq->nb_tx_desc - 1);
+       txq->nb_tx_free = (uint16_t)(txq->nb_tx_desc - 1);
+       txq->ctx_curr = 0;
+       memset((void *)&txq->ctx_cache, 0,
+               TXGBE_CTX_NUM * sizeof(struct txgbe_ctx_info));
+}
+
+static const struct txgbe_txq_ops def_txq_ops = {
        .release_mbufs = txgbe_tx_queue_release_mbufs,
        .free_swring = txgbe_tx_free_swring,
+       .reset = txgbe_reset_tx_queue,
 };
 
 /* Takes an ethdev and a queue and sets up the tx function to be used based on
@@ -1588,6 +2529,33 @@ txgbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
+void __rte_cold
+txgbe_dev_clear_queues(struct rte_eth_dev *dev)
+{
+       unsigned int i;
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+       PMD_INIT_FUNC_TRACE();
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               struct txgbe_tx_queue *txq = dev->data->tx_queues[i];
+
+               if (txq != NULL) {
+                       txq->ops->release_mbufs(txq);
+                       txq->ops->reset(txq);
+               }
+       }
+
+       for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               struct txgbe_rx_queue *rxq = dev->data->rx_queues[i];
+
+               if (rxq != NULL) {
+                       txgbe_rx_queue_release_mbufs(rxq);
+                       txgbe_reset_rx_queue(adapter, rxq);
+               }
+       }
+}
+
 void
 txgbe_dev_free_queues(struct rte_eth_dev *dev)
 {
@@ -1608,10 +2576,980 @@ txgbe_dev_free_queues(struct rte_eth_dev *dev)
        dev->data->nb_tx_queues = 0;
 }
 
-void __rte_cold
-txgbe_set_rx_function(struct rte_eth_dev *dev)
+/**
+ * Receive Side Scaling (RSS)
+ *
+ * Principles:
+ * The source and destination IP addresses of the IP header and the source
+ * and destination ports of TCP/UDP headers, if any, of received packets are
+ * hashed against a configurable random key to compute a 32-bit RSS hash result.
+ * The seven (7) LSBs of the 32-bit hash result are used as an index into a
+ * 128-entry redirection table (RETA).  Each entry of the RETA provides a 3-bit
+ * RSS output index which is used as the RX queue index where to store the
+ * received packets.
+ * The following output is supplied in the RX write-back descriptor:
+ *     - 32-bit result of the Microsoft RSS hash function,
+ *     - 4-bit RSS type field.
+ */
+
+/*
+ * Used as the default key.
+ */
+static uint8_t rss_intel_key[40] = {
+       0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2,
+       0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0,
+       0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4,
+       0x77, 0xCB, 0x2D, 0xA3, 0x80, 0x30, 0xF2, 0x0C,
+       0x6A, 0x42, 0xB7, 0x3B, 0xBE, 0xAC, 0x01, 0xFA,
+};
+
+static void
+txgbe_rss_disable(struct rte_eth_dev *dev)
 {
-       RTE_SET_USED(dev);
+       struct txgbe_hw *hw;
+
+       hw = TXGBE_DEV_HW(dev);
+
+       wr32m(hw, TXGBE_RACTL, TXGBE_RACTL_RSSENA, 0);
+}
+
+int
+txgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
+                         struct rte_eth_rss_conf *rss_conf)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint8_t  *hash_key;
+       uint32_t mrqc;
+       uint32_t rss_key;
+       uint64_t rss_hf;
+       uint16_t i;
+
+       if (!txgbe_rss_update_sp(hw->mac.type)) {
+               PMD_DRV_LOG(ERR, "RSS hash update is not supported on this "
+                       "NIC.");
+               return -ENOTSUP;
+       }
+
+       hash_key = rss_conf->rss_key;
+       if (hash_key) {
+               /* Fill in RSS hash key */
+               for (i = 0; i < 10; i++) {
+                       rss_key  = LS32(hash_key[(i * 4) + 0], 0, 0xFF);
+                       rss_key |= LS32(hash_key[(i * 4) + 1], 8, 0xFF);
+                       rss_key |= LS32(hash_key[(i * 4) + 2], 16, 0xFF);
+                       rss_key |= LS32(hash_key[(i * 4) + 3], 24, 0xFF);
+                       wr32a(hw, TXGBE_REG_RSSKEY, i, rss_key);
+               }
+       }
+
+       /* Set configured hashing protocols */
+       rss_hf = rss_conf->rss_hf & TXGBE_RSS_OFFLOAD_ALL;
+       mrqc = rd32(hw, TXGBE_RACTL);
+       mrqc &= ~TXGBE_RACTL_RSSMASK;
+       if (rss_hf & ETH_RSS_IPV4)
+               mrqc |= TXGBE_RACTL_RSSIPV4;
+       if (rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)
+               mrqc |= TXGBE_RACTL_RSSIPV4TCP;
+       if (rss_hf & ETH_RSS_IPV6 ||
+           rss_hf & ETH_RSS_IPV6_EX)
+               mrqc |= TXGBE_RACTL_RSSIPV6;
+       if (rss_hf & ETH_RSS_NONFRAG_IPV6_TCP ||
+           rss_hf & ETH_RSS_IPV6_TCP_EX)
+               mrqc |= TXGBE_RACTL_RSSIPV6TCP;
+       if (rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)
+               mrqc |= TXGBE_RACTL_RSSIPV4UDP;
+       if (rss_hf & ETH_RSS_NONFRAG_IPV6_UDP ||
+           rss_hf & ETH_RSS_IPV6_UDP_EX)
+               mrqc |= TXGBE_RACTL_RSSIPV6UDP;
+
+       if (rss_hf)
+               mrqc |= TXGBE_RACTL_RSSENA;
+       else
+               mrqc &= ~TXGBE_RACTL_RSSENA;
+
+       wr32(hw, TXGBE_RACTL, mrqc);
+
+       return 0;
+}
+
+int
+txgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+                           struct rte_eth_rss_conf *rss_conf)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint8_t *hash_key;
+       uint32_t mrqc;
+       uint32_t rss_key;
+       uint64_t rss_hf;
+       uint16_t i;
+
+       hash_key = rss_conf->rss_key;
+       if (hash_key) {
+               /* Return RSS hash key */
+               for (i = 0; i < 10; i++) {
+                       rss_key = rd32a(hw, TXGBE_REG_RSSKEY, i);
+                       hash_key[(i * 4) + 0] = RS32(rss_key, 0, 0xFF);
+                       hash_key[(i * 4) + 1] = RS32(rss_key, 8, 0xFF);
+                       hash_key[(i * 4) + 2] = RS32(rss_key, 16, 0xFF);
+                       hash_key[(i * 4) + 3] = RS32(rss_key, 24, 0xFF);
+               }
+       }
+
+       rss_hf = 0;
+       mrqc = rd32(hw, TXGBE_RACTL);
+       if (mrqc & TXGBE_RACTL_RSSIPV4)
+               rss_hf |= ETH_RSS_IPV4;
+       if (mrqc & TXGBE_RACTL_RSSIPV4TCP)
+               rss_hf |= ETH_RSS_NONFRAG_IPV4_TCP;
+       if (mrqc & TXGBE_RACTL_RSSIPV6)
+               rss_hf |= ETH_RSS_IPV6 |
+                         ETH_RSS_IPV6_EX;
+       if (mrqc & TXGBE_RACTL_RSSIPV6TCP)
+               rss_hf |= ETH_RSS_NONFRAG_IPV6_TCP |
+                         ETH_RSS_IPV6_TCP_EX;
+       if (mrqc & TXGBE_RACTL_RSSIPV4UDP)
+               rss_hf |= ETH_RSS_NONFRAG_IPV4_UDP;
+       if (mrqc & TXGBE_RACTL_RSSIPV6UDP)
+               rss_hf |= ETH_RSS_NONFRAG_IPV6_UDP |
+                         ETH_RSS_IPV6_UDP_EX;
+       if (!(mrqc & TXGBE_RACTL_RSSENA))
+               rss_hf = 0;
+
+       rss_hf &= TXGBE_RSS_OFFLOAD_ALL;
+
+       rss_conf->rss_hf = rss_hf;
+       return 0;
+}
+
+static void
+txgbe_rss_configure(struct rte_eth_dev *dev)
+{
+       struct rte_eth_rss_conf rss_conf;
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint32_t reta;
+       uint16_t i;
+       uint16_t j;
+
+       PMD_INIT_FUNC_TRACE();
+
+       /*
+        * Fill in redirection table
+        * The byte-swap is needed because NIC registers are in
+        * little-endian order.
+        */
+       if (adapter->rss_reta_updated == 0) {
+               reta = 0;
+               for (i = 0, j = 0; i < ETH_RSS_RETA_SIZE_128; i++, j++) {
+                       if (j == dev->data->nb_rx_queues)
+                               j = 0;
+                       reta = (reta >> 8) | LS32(j, 24, 0xFF);
+                       if ((i & 3) == 3)
+                               wr32a(hw, TXGBE_REG_RSSTBL, i >> 2, reta);
+               }
+       }
+       /*
+        * Configure the RSS key and the RSS protocols used to compute
+        * the RSS hash of input packets.
+        */
+       rss_conf = dev->data->dev_conf.rx_adv_conf.rss_conf;
+       if (rss_conf.rss_key == NULL)
+               rss_conf.rss_key = rss_intel_key; /* Default hash key */
+       txgbe_dev_rss_hash_update(dev, &rss_conf);
+}
+
+#define NUM_VFTA_REGISTERS 128
+#define NIC_RX_BUFFER_SIZE 0x200
+
+static void
+txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev)
+{
+       struct rte_eth_vmdq_dcb_conf *cfg;
+       struct txgbe_hw *hw;
+       enum rte_eth_nb_pools num_pools;
+       uint32_t mrqc, vt_ctl, queue_mapping, vlanctrl;
+       uint16_t pbsize;
+       uint8_t nb_tcs; /* number of traffic classes */
+       int i;
+
+       PMD_INIT_FUNC_TRACE();
+       hw = TXGBE_DEV_HW(dev);
+       cfg = &dev->data->dev_conf.rx_adv_conf.vmdq_dcb_conf;
+       num_pools = cfg->nb_queue_pools;
+       /* Check we have a valid number of pools */
+       if (num_pools != ETH_16_POOLS && num_pools != ETH_32_POOLS) {
+               txgbe_rss_disable(dev);
+               return;
+       }
+       /* 16 pools -> 8 traffic classes, 32 pools -> 4 traffic classes */
+       nb_tcs = (uint8_t)(ETH_VMDQ_DCB_NUM_QUEUES / (int)num_pools);
+
+       /*
+        * split rx buffer up into sections, each for 1 traffic class
+        */
+       pbsize = (uint16_t)(NIC_RX_BUFFER_SIZE / nb_tcs);
+       for (i = 0; i < nb_tcs; i++) {
+               uint32_t rxpbsize = rd32(hw, TXGBE_PBRXSIZE(i));
+
+               rxpbsize &= (~(0x3FF << 10));
+               /* clear 10 bits. */
+               rxpbsize |= (pbsize << 10); /* set value */
+               wr32(hw, TXGBE_PBRXSIZE(i), rxpbsize);
+       }
+       /* zero alloc all unused TCs */
+       for (i = nb_tcs; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+               uint32_t rxpbsize = rd32(hw, TXGBE_PBRXSIZE(i));
+
+               rxpbsize &= (~(0x3FF << 10));
+               /* clear 10 bits. */
+               wr32(hw, TXGBE_PBRXSIZE(i), rxpbsize);
+       }
+
+       if (num_pools == ETH_16_POOLS) {
+               mrqc = TXGBE_PORTCTL_NUMTC_8;
+               mrqc |= TXGBE_PORTCTL_NUMVT_16;
+       } else {
+               mrqc = TXGBE_PORTCTL_NUMTC_4;
+               mrqc |= TXGBE_PORTCTL_NUMVT_32;
+       }
+       wr32m(hw, TXGBE_PORTCTL,
+             TXGBE_PORTCTL_NUMTC_MASK | TXGBE_PORTCTL_NUMVT_MASK, mrqc);
+
+       vt_ctl = TXGBE_POOLCTL_RPLEN;
+       if (cfg->enable_default_pool)
+               vt_ctl |= TXGBE_POOLCTL_DEFPL(cfg->default_pool);
+       else
+               vt_ctl |= TXGBE_POOLCTL_DEFDSA;
+
+       wr32(hw, TXGBE_POOLCTL, vt_ctl);
+
+       queue_mapping = 0;
+       for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++)
+               /*
+                * mapping is done with 3 bits per priority,
+                * so shift by i*3 each time
+                */
+               queue_mapping |= ((cfg->dcb_tc[i] & 0x07) << (i * 3));
+
+       wr32(hw, TXGBE_RPUP2TC, queue_mapping);
+
+       wr32(hw, TXGBE_ARBRXCTL, TXGBE_ARBRXCTL_RRM);
+
+       /* enable vlan filtering and allow all vlan tags through */
+       vlanctrl = rd32(hw, TXGBE_VLANCTL);
+       vlanctrl |= TXGBE_VLANCTL_VFE; /* enable vlan filters */
+       wr32(hw, TXGBE_VLANCTL, vlanctrl);
+
+       /* enable all vlan filters */
+       for (i = 0; i < NUM_VFTA_REGISTERS; i++)
+               wr32(hw, TXGBE_VLANTBL(i), 0xFFFFFFFF);
+
+       wr32(hw, TXGBE_POOLRXENA(0),
+                       num_pools == ETH_16_POOLS ? 0xFFFF : 0xFFFFFFFF);
+
+       wr32(hw, TXGBE_ETHADDRIDX, 0);
+       wr32(hw, TXGBE_ETHADDRASSL, 0xFFFFFFFF);
+       wr32(hw, TXGBE_ETHADDRASSH, 0xFFFFFFFF);
+
+       /* set up filters for vlan tags as configured */
+       for (i = 0; i < cfg->nb_pool_maps; i++) {
+               /* set vlan id in VF register and set the valid bit */
+               wr32(hw, TXGBE_PSRVLANIDX, i);
+               wr32(hw, TXGBE_PSRVLAN, (TXGBE_PSRVLAN_EA |
+                               (cfg->pool_map[i].vlan_id & 0xFFF)));
+
+               wr32(hw, TXGBE_PSRVLANPLM(0), cfg->pool_map[i].pools);
+       }
+}
+
+/**
+ * txgbe_dcb_config_tx_hw_config - Configure general DCB TX parameters
+ * @dev: pointer to eth_dev structure
+ * @dcb_config: pointer to txgbe_dcb_config structure
+ */
+static void
+txgbe_dcb_tx_hw_config(struct rte_eth_dev *dev,
+                      struct txgbe_dcb_config *dcb_config)
+{
+       uint32_t reg;
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+
+       PMD_INIT_FUNC_TRACE();
+
+       /* Disable the Tx desc arbiter */
+       reg = rd32(hw, TXGBE_ARBTXCTL);
+       reg |= TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, reg);
+
+       /* Enable DCB for Tx with 8 TCs */
+       reg = rd32(hw, TXGBE_PORTCTL);
+       reg &= TXGBE_PORTCTL_NUMTC_MASK;
+       reg |= TXGBE_PORTCTL_DCB;
+       if (dcb_config->num_tcs.pg_tcs == 8)
+               reg |= TXGBE_PORTCTL_NUMTC_8;
+       else
+               reg |= TXGBE_PORTCTL_NUMTC_4;
+
+       wr32(hw, TXGBE_PORTCTL, reg);
+
+       /* Enable the Tx desc arbiter */
+       reg = rd32(hw, TXGBE_ARBTXCTL);
+       reg &= ~TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, reg);
+}
+
+/**
+ * txgbe_vmdq_dcb_hw_tx_config - Configure general VMDQ+DCB TX parameters
+ * @dev: pointer to rte_eth_dev structure
+ * @dcb_config: pointer to txgbe_dcb_config structure
+ */
+static void
+txgbe_vmdq_dcb_hw_tx_config(struct rte_eth_dev *dev,
+                       struct txgbe_dcb_config *dcb_config)
+{
+       struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
+                       &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       /*PF VF Transmit Enable*/
+       wr32(hw, TXGBE_POOLTXENA(0),
+               vmdq_tx_conf->nb_queue_pools ==
+                               ETH_16_POOLS ? 0xFFFF : 0xFFFFFFFF);
+
+       /*Configure general DCB TX parameters*/
+       txgbe_dcb_tx_hw_config(dev, dcb_config);
+}
+
+static void
+txgbe_vmdq_dcb_rx_config(struct rte_eth_dev *dev,
+                       struct txgbe_dcb_config *dcb_config)
+{
+       struct rte_eth_vmdq_dcb_conf *vmdq_rx_conf =
+                       &dev->data->dev_conf.rx_adv_conf.vmdq_dcb_conf;
+       struct txgbe_dcb_tc_config *tc;
+       uint8_t i, j;
+
+       /* convert rte_eth_conf.rx_adv_conf to struct txgbe_dcb_config */
+       if (vmdq_rx_conf->nb_queue_pools == ETH_16_POOLS) {
+               dcb_config->num_tcs.pg_tcs = ETH_8_TCS;
+               dcb_config->num_tcs.pfc_tcs = ETH_8_TCS;
+       } else {
+               dcb_config->num_tcs.pg_tcs = ETH_4_TCS;
+               dcb_config->num_tcs.pfc_tcs = ETH_4_TCS;
+       }
+
+       /* Initialize User Priority to Traffic Class mapping */
+       for (j = 0; j < TXGBE_DCB_TC_MAX; j++) {
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_RX_CONFIG].up_to_tc_bitmap = 0;
+       }
+
+       /* User Priority to Traffic Class mapping */
+       for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+               j = vmdq_rx_conf->dcb_tc[i];
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_RX_CONFIG].up_to_tc_bitmap |=
+                                               (uint8_t)(1 << i);
+       }
+}
+
+static void
+txgbe_dcb_vt_tx_config(struct rte_eth_dev *dev,
+                       struct txgbe_dcb_config *dcb_config)
+{
+       struct rte_eth_vmdq_dcb_tx_conf *vmdq_tx_conf =
+                       &dev->data->dev_conf.tx_adv_conf.vmdq_dcb_tx_conf;
+       struct txgbe_dcb_tc_config *tc;
+       uint8_t i, j;
+
+       /* convert rte_eth_conf.rx_adv_conf to struct txgbe_dcb_config */
+       if (vmdq_tx_conf->nb_queue_pools == ETH_16_POOLS) {
+               dcb_config->num_tcs.pg_tcs = ETH_8_TCS;
+               dcb_config->num_tcs.pfc_tcs = ETH_8_TCS;
+       } else {
+               dcb_config->num_tcs.pg_tcs = ETH_4_TCS;
+               dcb_config->num_tcs.pfc_tcs = ETH_4_TCS;
+       }
+
+       /* Initialize User Priority to Traffic Class mapping */
+       for (j = 0; j < TXGBE_DCB_TC_MAX; j++) {
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_TX_CONFIG].up_to_tc_bitmap = 0;
+       }
+
+       /* User Priority to Traffic Class mapping */
+       for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+               j = vmdq_tx_conf->dcb_tc[i];
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_TX_CONFIG].up_to_tc_bitmap |=
+                                               (uint8_t)(1 << i);
+       }
+}
+
+static void
+txgbe_dcb_rx_config(struct rte_eth_dev *dev,
+               struct txgbe_dcb_config *dcb_config)
+{
+       struct rte_eth_dcb_rx_conf *rx_conf =
+                       &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf;
+       struct txgbe_dcb_tc_config *tc;
+       uint8_t i, j;
+
+       dcb_config->num_tcs.pg_tcs = (uint8_t)rx_conf->nb_tcs;
+       dcb_config->num_tcs.pfc_tcs = (uint8_t)rx_conf->nb_tcs;
+
+       /* Initialize User Priority to Traffic Class mapping */
+       for (j = 0; j < TXGBE_DCB_TC_MAX; j++) {
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_RX_CONFIG].up_to_tc_bitmap = 0;
+       }
+
+       /* User Priority to Traffic Class mapping */
+       for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+               j = rx_conf->dcb_tc[i];
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_RX_CONFIG].up_to_tc_bitmap |=
+                                               (uint8_t)(1 << i);
+       }
+}
+
+static void
+txgbe_dcb_tx_config(struct rte_eth_dev *dev,
+               struct txgbe_dcb_config *dcb_config)
+{
+       struct rte_eth_dcb_tx_conf *tx_conf =
+                       &dev->data->dev_conf.tx_adv_conf.dcb_tx_conf;
+       struct txgbe_dcb_tc_config *tc;
+       uint8_t i, j;
+
+       dcb_config->num_tcs.pg_tcs = (uint8_t)tx_conf->nb_tcs;
+       dcb_config->num_tcs.pfc_tcs = (uint8_t)tx_conf->nb_tcs;
+
+       /* Initialize User Priority to Traffic Class mapping */
+       for (j = 0; j < TXGBE_DCB_TC_MAX; j++) {
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_TX_CONFIG].up_to_tc_bitmap = 0;
+       }
+
+       /* User Priority to Traffic Class mapping */
+       for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+               j = tx_conf->dcb_tc[i];
+               tc = &dcb_config->tc_config[j];
+               tc->path[TXGBE_DCB_TX_CONFIG].up_to_tc_bitmap |=
+                                               (uint8_t)(1 << i);
+       }
+}
+
+/**
+ * txgbe_dcb_rx_hw_config - Configure general DCB RX HW parameters
+ * @dev: pointer to eth_dev structure
+ * @dcb_config: pointer to txgbe_dcb_config structure
+ */
+static void
+txgbe_dcb_rx_hw_config(struct rte_eth_dev *dev,
+                      struct txgbe_dcb_config *dcb_config)
+{
+       uint32_t reg;
+       uint32_t vlanctrl;
+       uint8_t i;
+       uint32_t q;
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       /*
+        * Disable the arbiter before changing parameters
+        * (always enable recycle mode; WSP)
+        */
+       reg = TXGBE_ARBRXCTL_RRM | TXGBE_ARBRXCTL_WSP | TXGBE_ARBRXCTL_DIA;
+       wr32(hw, TXGBE_ARBRXCTL, reg);
+
+       reg = rd32(hw, TXGBE_PORTCTL);
+       reg &= ~(TXGBE_PORTCTL_NUMTC_MASK | TXGBE_PORTCTL_NUMVT_MASK);
+       if (dcb_config->num_tcs.pg_tcs == 4) {
+               reg |= TXGBE_PORTCTL_NUMTC_4;
+               if (dcb_config->vt_mode)
+                       reg |= TXGBE_PORTCTL_NUMVT_32;
+               else
+                       wr32(hw, TXGBE_POOLCTL, 0);
+       }
+
+       if (dcb_config->num_tcs.pg_tcs == 8) {
+               reg |= TXGBE_PORTCTL_NUMTC_8;
+               if (dcb_config->vt_mode)
+                       reg |= TXGBE_PORTCTL_NUMVT_16;
+               else
+                       wr32(hw, TXGBE_POOLCTL, 0);
+       }
+
+       wr32(hw, TXGBE_PORTCTL, reg);
+
+       if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
+               /* Disable drop for all queues in VMDQ mode*/
+               for (q = 0; q < TXGBE_MAX_RX_QUEUE_NUM; q++) {
+                       u32 val = 1 << (q % 32);
+                       wr32m(hw, TXGBE_QPRXDROP(q / 32), val, val);
+               }
+       } else {
+               /* Enable drop for all queues in SRIOV mode */
+               for (q = 0; q < TXGBE_MAX_RX_QUEUE_NUM; q++) {
+                       u32 val = 1 << (q % 32);
+                       wr32m(hw, TXGBE_QPRXDROP(q / 32), val, val);
+               }
+       }
+
+       /* VLNCTL: enable vlan filtering and allow all vlan tags through */
+       vlanctrl = rd32(hw, TXGBE_VLANCTL);
+       vlanctrl |= TXGBE_VLANCTL_VFE; /* enable vlan filters */
+       wr32(hw, TXGBE_VLANCTL, vlanctrl);
+
+       /* VLANTBL - enable all vlan filters */
+       for (i = 0; i < NUM_VFTA_REGISTERS; i++)
+               wr32(hw, TXGBE_VLANTBL(i), 0xFFFFFFFF);
+
+       /*
+        * Configure Rx packet plane (recycle mode; WSP) and
+        * enable arbiter
+        */
+       reg = TXGBE_ARBRXCTL_RRM | TXGBE_ARBRXCTL_WSP;
+       wr32(hw, TXGBE_ARBRXCTL, reg);
+}
+
+static void
+txgbe_dcb_hw_arbite_rx_config(struct txgbe_hw *hw, uint16_t *refill,
+               uint16_t *max, uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
+{
+       txgbe_dcb_config_rx_arbiter_raptor(hw, refill, max, bwg_id,
+                                         tsa, map);
+}
+
+static void
+txgbe_dcb_hw_arbite_tx_config(struct txgbe_hw *hw, uint16_t *refill,
+               uint16_t *max, uint8_t *bwg_id, uint8_t *tsa, uint8_t *map)
+{
+       switch (hw->mac.type) {
+       case txgbe_mac_raptor:
+               txgbe_dcb_config_tx_desc_arbiter_raptor(hw, refill,
+                                                       max, bwg_id, tsa);
+               txgbe_dcb_config_tx_data_arbiter_raptor(hw, refill,
+                                                       max, bwg_id, tsa, map);
+               break;
+       default:
+               break;
+       }
+}
+
+#define DCB_RX_CONFIG  1
+#define DCB_TX_CONFIG  1
+#define DCB_TX_PB      1024
+/**
+ * txgbe_dcb_hw_configure - Enable DCB and configure
+ * general DCB in VT mode and non-VT mode parameters
+ * @dev: pointer to rte_eth_dev structure
+ * @dcb_config: pointer to txgbe_dcb_config structure
+ */
+static int
+txgbe_dcb_hw_configure(struct rte_eth_dev *dev,
+                       struct txgbe_dcb_config *dcb_config)
+{
+       int     ret = 0;
+       uint8_t i, pfc_en, nb_tcs;
+       uint16_t pbsize, rx_buffer_size;
+       uint8_t config_dcb_rx = 0;
+       uint8_t config_dcb_tx = 0;
+       uint8_t tsa[TXGBE_DCB_TC_MAX] = {0};
+       uint8_t bwgid[TXGBE_DCB_TC_MAX] = {0};
+       uint16_t refill[TXGBE_DCB_TC_MAX] = {0};
+       uint16_t max[TXGBE_DCB_TC_MAX] = {0};
+       uint8_t map[TXGBE_DCB_TC_MAX] = {0};
+       struct txgbe_dcb_tc_config *tc;
+       uint32_t max_frame = dev->data->mtu +
+                       RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       struct txgbe_bw_conf *bw_conf = TXGBE_DEV_BW_CONF(dev);
+
+       switch (dev->data->dev_conf.rxmode.mq_mode) {
+       case ETH_MQ_RX_VMDQ_DCB:
+               dcb_config->vt_mode = true;
+               config_dcb_rx = DCB_RX_CONFIG;
+               /*
+                * get dcb and VT rx configuration parameters
+                * from rte_eth_conf
+                */
+               txgbe_vmdq_dcb_rx_config(dev, dcb_config);
+               /*Configure general VMDQ and DCB RX parameters*/
+               txgbe_vmdq_dcb_configure(dev);
+               break;
+       case ETH_MQ_RX_DCB:
+       case ETH_MQ_RX_DCB_RSS:
+               dcb_config->vt_mode = false;
+               config_dcb_rx = DCB_RX_CONFIG;
+               /* Get dcb TX configuration parameters from rte_eth_conf */
+               txgbe_dcb_rx_config(dev, dcb_config);
+               /*Configure general DCB RX parameters*/
+               txgbe_dcb_rx_hw_config(dev, dcb_config);
+               break;
+       default:
+               PMD_INIT_LOG(ERR, "Incorrect DCB RX mode configuration");
+               break;
+       }
+       switch (dev->data->dev_conf.txmode.mq_mode) {
+       case ETH_MQ_TX_VMDQ_DCB:
+               dcb_config->vt_mode = true;
+               config_dcb_tx = DCB_TX_CONFIG;
+               /* get DCB and VT TX configuration parameters
+                * from rte_eth_conf
+                */
+               txgbe_dcb_vt_tx_config(dev, dcb_config);
+               /* Configure general VMDQ and DCB TX parameters */
+               txgbe_vmdq_dcb_hw_tx_config(dev, dcb_config);
+               break;
+
+       case ETH_MQ_TX_DCB:
+               dcb_config->vt_mode = false;
+               config_dcb_tx = DCB_TX_CONFIG;
+               /* get DCB TX configuration parameters from rte_eth_conf */
+               txgbe_dcb_tx_config(dev, dcb_config);
+               /* Configure general DCB TX parameters */
+               txgbe_dcb_tx_hw_config(dev, dcb_config);
+               break;
+       default:
+               PMD_INIT_LOG(ERR, "Incorrect DCB TX mode configuration");
+               break;
+       }
+
+       nb_tcs = dcb_config->num_tcs.pfc_tcs;
+       /* Unpack map */
+       txgbe_dcb_unpack_map_cee(dcb_config, TXGBE_DCB_RX_CONFIG, map);
+       if (nb_tcs == ETH_4_TCS) {
+               /* Avoid un-configured priority mapping to TC0 */
+               uint8_t j = 4;
+               uint8_t mask = 0xFF;
+
+               for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES - 4; i++)
+                       mask = (uint8_t)(mask & (~(1 << map[i])));
+               for (i = 0; mask && (i < TXGBE_DCB_TC_MAX); i++) {
+                       if ((mask & 0x1) && j < ETH_DCB_NUM_USER_PRIORITIES)
+                               map[j++] = i;
+                       mask >>= 1;
+               }
+               /* Re-configure 4 TCs BW */
+               for (i = 0; i < nb_tcs; i++) {
+                       tc = &dcb_config->tc_config[i];
+                       if (bw_conf->tc_num != nb_tcs)
+                               tc->path[TXGBE_DCB_TX_CONFIG].bwg_percent =
+                                       (uint8_t)(100 / nb_tcs);
+                       tc->path[TXGBE_DCB_RX_CONFIG].bwg_percent =
+                                               (uint8_t)(100 / nb_tcs);
+               }
+               for (; i < TXGBE_DCB_TC_MAX; i++) {
+                       tc = &dcb_config->tc_config[i];
+                       tc->path[TXGBE_DCB_TX_CONFIG].bwg_percent = 0;
+                       tc->path[TXGBE_DCB_RX_CONFIG].bwg_percent = 0;
+               }
+       } else {
+               /* Re-configure 8 TCs BW */
+               for (i = 0; i < nb_tcs; i++) {
+                       tc = &dcb_config->tc_config[i];
+                       if (bw_conf->tc_num != nb_tcs)
+                               tc->path[TXGBE_DCB_TX_CONFIG].bwg_percent =
+                                       (uint8_t)(100 / nb_tcs + (i & 1));
+                       tc->path[TXGBE_DCB_RX_CONFIG].bwg_percent =
+                               (uint8_t)(100 / nb_tcs + (i & 1));
+               }
+       }
+
+       rx_buffer_size = NIC_RX_BUFFER_SIZE;
+
+       if (config_dcb_rx) {
+               /* Set RX buffer size */
+               pbsize = (uint16_t)(rx_buffer_size / nb_tcs);
+               uint32_t rxpbsize = pbsize << 10;
+
+               for (i = 0; i < nb_tcs; i++)
+                       wr32(hw, TXGBE_PBRXSIZE(i), rxpbsize);
+
+               /* zero alloc all unused TCs */
+               for (; i < ETH_DCB_NUM_USER_PRIORITIES; i++)
+                       wr32(hw, TXGBE_PBRXSIZE(i), 0);
+       }
+       if (config_dcb_tx) {
+               /* Only support an equally distributed
+                *  Tx packet buffer strategy.
+                */
+               uint32_t txpktsize = TXGBE_PBTXSIZE_MAX / nb_tcs;
+               uint32_t txpbthresh = (txpktsize / DCB_TX_PB) -
+                                       TXGBE_TXPKT_SIZE_MAX;
+
+               for (i = 0; i < nb_tcs; i++) {
+                       wr32(hw, TXGBE_PBTXSIZE(i), txpktsize);
+                       wr32(hw, TXGBE_PBTXDMATH(i), txpbthresh);
+               }
+               /* Clear unused TCs, if any, to zero buffer size*/
+               for (; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+                       wr32(hw, TXGBE_PBTXSIZE(i), 0);
+                       wr32(hw, TXGBE_PBTXDMATH(i), 0);
+               }
+       }
+
+       /*Calculates traffic class credits*/
+       txgbe_dcb_calculate_tc_credits_cee(hw, dcb_config, max_frame,
+                               TXGBE_DCB_TX_CONFIG);
+       txgbe_dcb_calculate_tc_credits_cee(hw, dcb_config, max_frame,
+                               TXGBE_DCB_RX_CONFIG);
+
+       if (config_dcb_rx) {
+               /* Unpack CEE standard containers */
+               txgbe_dcb_unpack_refill_cee(dcb_config,
+                               TXGBE_DCB_RX_CONFIG, refill);
+               txgbe_dcb_unpack_max_cee(dcb_config, max);
+               txgbe_dcb_unpack_bwgid_cee(dcb_config,
+                               TXGBE_DCB_RX_CONFIG, bwgid);
+               txgbe_dcb_unpack_tsa_cee(dcb_config,
+                               TXGBE_DCB_RX_CONFIG, tsa);
+               /* Configure PG(ETS) RX */
+               txgbe_dcb_hw_arbite_rx_config(hw, refill, max, bwgid, tsa, map);
+       }
+
+       if (config_dcb_tx) {
+               /* Unpack CEE standard containers */
+               txgbe_dcb_unpack_refill_cee(dcb_config,
+                               TXGBE_DCB_TX_CONFIG, refill);
+               txgbe_dcb_unpack_max_cee(dcb_config, max);
+               txgbe_dcb_unpack_bwgid_cee(dcb_config,
+                               TXGBE_DCB_TX_CONFIG, bwgid);
+               txgbe_dcb_unpack_tsa_cee(dcb_config,
+                               TXGBE_DCB_TX_CONFIG, tsa);
+               /* Configure PG(ETS) TX */
+               txgbe_dcb_hw_arbite_tx_config(hw, refill, max, bwgid, tsa, map);
+       }
+
+       /* Configure queue statistics registers */
+       txgbe_dcb_config_tc_stats_raptor(hw, dcb_config);
+
+       /* Check if the PFC is supported */
+       if (dev->data->dev_conf.dcb_capability_en & ETH_DCB_PFC_SUPPORT) {
+               pbsize = (uint16_t)(rx_buffer_size / nb_tcs);
+               for (i = 0; i < nb_tcs; i++) {
+                       /* If the TC count is 8,
+                        * and the default high_water is 48,
+                        * the low_water is 16 as default.
+                        */
+                       hw->fc.high_water[i] = (pbsize * 3) / 4;
+                       hw->fc.low_water[i] = pbsize / 4;
+                       /* Enable pfc for this TC */
+                       tc = &dcb_config->tc_config[i];
+                       tc->pfc = txgbe_dcb_pfc_enabled;
+               }
+               txgbe_dcb_unpack_pfc_cee(dcb_config, map, &pfc_en);
+               if (dcb_config->num_tcs.pfc_tcs == ETH_4_TCS)
+                       pfc_en &= 0x0F;
+               ret = txgbe_dcb_config_pfc(hw, pfc_en, map);
+       }
+
+       return ret;
+}
+
+void txgbe_configure_pb(struct rte_eth_dev *dev)
+{
+       struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+
+       int hdrm;
+       int tc = dev_conf->rx_adv_conf.dcb_rx_conf.nb_tcs;
+
+       /* Reserve 256KB(/512KB) rx buffer for fdir */
+       hdrm = 256; /*KB*/
+
+       hw->mac.setup_pba(hw, tc, hdrm, PBA_STRATEGY_EQUAL);
+}
+
+void txgbe_configure_port(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       int i = 0;
+       uint16_t tpids[8] = {RTE_ETHER_TYPE_VLAN, RTE_ETHER_TYPE_QINQ,
+                               0x9100, 0x9200,
+                               0x0000, 0x0000,
+                               0x0000, 0x0000};
+
+       PMD_INIT_FUNC_TRACE();
+
+       /* default outer vlan tpid */
+       wr32(hw, TXGBE_EXTAG,
+               TXGBE_EXTAG_ETAG(RTE_ETHER_TYPE_ETAG) |
+               TXGBE_EXTAG_VLAN(RTE_ETHER_TYPE_QINQ));
+
+       /* default inner vlan tpid */
+       wr32m(hw, TXGBE_VLANCTL,
+               TXGBE_VLANCTL_TPID_MASK,
+               TXGBE_VLANCTL_TPID(RTE_ETHER_TYPE_VLAN));
+       wr32m(hw, TXGBE_DMATXCTRL,
+               TXGBE_DMATXCTRL_TPID_MASK,
+               TXGBE_DMATXCTRL_TPID(RTE_ETHER_TYPE_VLAN));
+
+       /* default vlan tpid filters */
+       for (i = 0; i < 8; i++) {
+               wr32m(hw, TXGBE_TAGTPID(i / 2),
+                       (i % 2 ? TXGBE_TAGTPID_MSB_MASK
+                              : TXGBE_TAGTPID_LSB_MASK),
+                       (i % 2 ? TXGBE_TAGTPID_MSB(tpids[i])
+                              : TXGBE_TAGTPID_LSB(tpids[i])));
+       }
+
+       /* default vxlan port */
+       wr32(hw, TXGBE_VXLANPORT, 4789);
+}
+
+/**
+ * txgbe_configure_dcb - Configure DCB  Hardware
+ * @dev: pointer to rte_eth_dev
+ */
+void txgbe_configure_dcb(struct rte_eth_dev *dev)
+{
+       struct txgbe_dcb_config *dcb_cfg = TXGBE_DEV_DCB_CONFIG(dev);
+       struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+
+       PMD_INIT_FUNC_TRACE();
+
+       /* check support mq_mode for DCB */
+       if (dev_conf->rxmode.mq_mode != ETH_MQ_RX_VMDQ_DCB &&
+           dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB &&
+           dev_conf->rxmode.mq_mode != ETH_MQ_RX_DCB_RSS)
+               return;
+
+       if (dev->data->nb_rx_queues > ETH_DCB_NUM_QUEUES)
+               return;
+
+       /** Configure DCB hardware **/
+       txgbe_dcb_hw_configure(dev, dcb_cfg);
+}
+
+/*
+ * VMDq only support for 10 GbE NIC.
+ */
+static void
+txgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
+{
+       struct rte_eth_vmdq_rx_conf *cfg;
+       struct txgbe_hw *hw;
+       enum rte_eth_nb_pools num_pools;
+       uint32_t mrqc, vt_ctl, vlanctrl;
+       uint32_t vmolr = 0;
+       int i;
+
+       PMD_INIT_FUNC_TRACE();
+       hw = TXGBE_DEV_HW(dev);
+       cfg = &dev->data->dev_conf.rx_adv_conf.vmdq_rx_conf;
+       num_pools = cfg->nb_queue_pools;
+
+       txgbe_rss_disable(dev);
+
+       /* enable vmdq */
+       mrqc = TXGBE_PORTCTL_NUMVT_64;
+       wr32m(hw, TXGBE_PORTCTL, TXGBE_PORTCTL_NUMVT_MASK, mrqc);
+
+       /* turn on virtualisation and set the default pool */
+       vt_ctl = TXGBE_POOLCTL_RPLEN;
+       if (cfg->enable_default_pool)
+               vt_ctl |= TXGBE_POOLCTL_DEFPL(cfg->default_pool);
+       else
+               vt_ctl |= TXGBE_POOLCTL_DEFDSA;
+
+       wr32(hw, TXGBE_POOLCTL, vt_ctl);
+
+       for (i = 0; i < (int)num_pools; i++) {
+               vmolr = txgbe_convert_vm_rx_mask_to_val(cfg->rx_mode, vmolr);
+               wr32(hw, TXGBE_POOLETHCTL(i), vmolr);
+       }
+
+       /* enable vlan filtering and allow all vlan tags through */
+       vlanctrl = rd32(hw, TXGBE_VLANCTL);
+       vlanctrl |= TXGBE_VLANCTL_VFE; /* enable vlan filters */
+       wr32(hw, TXGBE_VLANCTL, vlanctrl);
+
+       /* enable all vlan filters */
+       for (i = 0; i < NUM_VFTA_REGISTERS; i++)
+               wr32(hw, TXGBE_VLANTBL(i), UINT32_MAX);
+
+       /* pool enabling for receive - 64 */
+       wr32(hw, TXGBE_POOLRXENA(0), UINT32_MAX);
+       if (num_pools == ETH_64_POOLS)
+               wr32(hw, TXGBE_POOLRXENA(1), UINT32_MAX);
+
+       /*
+        * allow pools to read specific mac addresses
+        * In this case, all pools should be able to read from mac addr 0
+        */
+       wr32(hw, TXGBE_ETHADDRIDX, 0);
+       wr32(hw, TXGBE_ETHADDRASSL, 0xFFFFFFFF);
+       wr32(hw, TXGBE_ETHADDRASSH, 0xFFFFFFFF);
+
+       /* set up filters for vlan tags as configured */
+       for (i = 0; i < cfg->nb_pool_maps; i++) {
+               /* set vlan id in VF register and set the valid bit */
+               wr32(hw, TXGBE_PSRVLANIDX, i);
+               wr32(hw, TXGBE_PSRVLAN, (TXGBE_PSRVLAN_EA |
+                               TXGBE_PSRVLAN_VID(cfg->pool_map[i].vlan_id)));
+               /*
+                * Put the allowed pools in VFB reg. As we only have 16 or 64
+                * pools, we only need to use the first half of the register
+                * i.e. bits 0-31
+                */
+               if (((cfg->pool_map[i].pools >> 32) & UINT32_MAX) == 0)
+                       wr32(hw, TXGBE_PSRVLANPLM(0),
+                               (cfg->pool_map[i].pools & UINT32_MAX));
+               else
+                       wr32(hw, TXGBE_PSRVLANPLM(1),
+                               ((cfg->pool_map[i].pools >> 32) & UINT32_MAX));
+       }
+
+       /* Tx General Switch Control Enables VMDQ loopback */
+       if (cfg->enable_loop_back) {
+               wr32(hw, TXGBE_PSRCTL, TXGBE_PSRCTL_LBENA);
+               for (i = 0; i < 64; i++)
+                       wr32m(hw, TXGBE_POOLETHCTL(i),
+                               TXGBE_POOLETHCTL_LLB, TXGBE_POOLETHCTL_LLB);
+       }
+
+       txgbe_flush(hw);
+}
+
+/*
+ * txgbe_vmdq_tx_hw_configure - Configure general VMDq TX parameters
+ * @hw: pointer to hardware structure
+ */
+static void
+txgbe_vmdq_tx_hw_configure(struct txgbe_hw *hw)
+{
+       uint32_t reg;
+       uint32_t q;
+
+       PMD_INIT_FUNC_TRACE();
+       /*PF VF Transmit Enable*/
+       wr32(hw, TXGBE_POOLTXENA(0), UINT32_MAX);
+       wr32(hw, TXGBE_POOLTXENA(1), UINT32_MAX);
+
+       /* Disable the Tx desc arbiter */
+       reg = rd32(hw, TXGBE_ARBTXCTL);
+       reg |= TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, reg);
+
+       wr32m(hw, TXGBE_PORTCTL, TXGBE_PORTCTL_NUMVT_MASK,
+               TXGBE_PORTCTL_NUMVT_64);
+
+       /* Disable drop for all queues */
+       for (q = 0; q < 128; q++) {
+               u32 val = 1 << (q % 32);
+               wr32m(hw, TXGBE_QPRXDROP(q / 32), val, val);
+       }
+
+       /* Enable the Tx desc arbiter */
+       reg = rd32(hw, TXGBE_ARBTXCTL);
+       reg &= ~TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, reg);
+
+       txgbe_flush(hw);
 }
 
 static int __rte_cold
@@ -1646,6 +3584,177 @@ txgbe_alloc_rx_queue_mbufs(struct txgbe_rx_queue *rxq)
        return 0;
 }
 
+static int
+txgbe_config_vf_rss(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw;
+       uint32_t mrqc;
+
+       txgbe_rss_configure(dev);
+
+       hw = TXGBE_DEV_HW(dev);
+
+       /* enable VF RSS */
+       mrqc = rd32(hw, TXGBE_PORTCTL);
+       mrqc &= ~(TXGBE_PORTCTL_NUMTC_MASK | TXGBE_PORTCTL_NUMVT_MASK);
+       switch (RTE_ETH_DEV_SRIOV(dev).active) {
+       case ETH_64_POOLS:
+               mrqc |= TXGBE_PORTCTL_NUMVT_64;
+               break;
+
+       case ETH_32_POOLS:
+               mrqc |= TXGBE_PORTCTL_NUMVT_32;
+               break;
+
+       default:
+               PMD_INIT_LOG(ERR, "Invalid pool number in IOV mode with VMDQ RSS");
+               return -EINVAL;
+       }
+
+       wr32(hw, TXGBE_PORTCTL, mrqc);
+
+       return 0;
+}
+
+static int
+txgbe_config_vf_default(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint32_t mrqc;
+
+       mrqc = rd32(hw, TXGBE_PORTCTL);
+       mrqc &= ~(TXGBE_PORTCTL_NUMTC_MASK | TXGBE_PORTCTL_NUMVT_MASK);
+       switch (RTE_ETH_DEV_SRIOV(dev).active) {
+       case ETH_64_POOLS:
+               mrqc |= TXGBE_PORTCTL_NUMVT_64;
+               break;
+
+       case ETH_32_POOLS:
+               mrqc |= TXGBE_PORTCTL_NUMVT_32;
+               break;
+
+       case ETH_16_POOLS:
+               mrqc |= TXGBE_PORTCTL_NUMVT_16;
+               break;
+       default:
+               PMD_INIT_LOG(ERR,
+                       "invalid pool number in IOV mode");
+               return 0;
+       }
+
+       wr32(hw, TXGBE_PORTCTL, mrqc);
+
+       return 0;
+}
+
+static int
+txgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
+{
+       if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
+               /*
+                * SRIOV inactive scheme
+                * any DCB/RSS w/o VMDq multi-queue setting
+                */
+               switch (dev->data->dev_conf.rxmode.mq_mode) {
+               case ETH_MQ_RX_RSS:
+               case ETH_MQ_RX_DCB_RSS:
+               case ETH_MQ_RX_VMDQ_RSS:
+                       txgbe_rss_configure(dev);
+                       break;
+
+               case ETH_MQ_RX_VMDQ_DCB:
+                       txgbe_vmdq_dcb_configure(dev);
+                       break;
+
+               case ETH_MQ_RX_VMDQ_ONLY:
+                       txgbe_vmdq_rx_hw_configure(dev);
+                       break;
+
+               case ETH_MQ_RX_NONE:
+               default:
+                       /* if mq_mode is none, disable rss mode.*/
+                       txgbe_rss_disable(dev);
+                       break;
+               }
+       } else {
+               /* SRIOV active scheme
+                * Support RSS together with SRIOV.
+                */
+               switch (dev->data->dev_conf.rxmode.mq_mode) {
+               case ETH_MQ_RX_RSS:
+               case ETH_MQ_RX_VMDQ_RSS:
+                       txgbe_config_vf_rss(dev);
+                       break;
+               case ETH_MQ_RX_VMDQ_DCB:
+               case ETH_MQ_RX_DCB:
+               /* In SRIOV, the configuration is the same as VMDq case */
+                       txgbe_vmdq_dcb_configure(dev);
+                       break;
+               /* DCB/RSS together with SRIOV is not supported */
+               case ETH_MQ_RX_VMDQ_DCB_RSS:
+               case ETH_MQ_RX_DCB_RSS:
+                       PMD_INIT_LOG(ERR,
+                               "Could not support DCB/RSS with VMDq & SRIOV");
+                       return -1;
+               default:
+                       txgbe_config_vf_default(dev);
+                       break;
+               }
+       }
+
+       return 0;
+}
+
+static int
+txgbe_dev_mq_tx_configure(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+       uint32_t mtqc;
+       uint32_t rttdcs;
+
+       /* disable arbiter */
+       rttdcs = rd32(hw, TXGBE_ARBTXCTL);
+       rttdcs |= TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, rttdcs);
+
+       if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
+               /*
+                * SRIOV inactive scheme
+                * any DCB w/o VMDq multi-queue setting
+                */
+               if (dev->data->dev_conf.txmode.mq_mode == ETH_MQ_TX_VMDQ_ONLY)
+                       txgbe_vmdq_tx_hw_configure(hw);
+               else
+                       wr32m(hw, TXGBE_PORTCTL, TXGBE_PORTCTL_NUMVT_MASK, 0);
+       } else {
+               switch (RTE_ETH_DEV_SRIOV(dev).active) {
+               /*
+                * SRIOV active scheme
+                * FIXME if support DCB together with VMDq & SRIOV
+                */
+               case ETH_64_POOLS:
+                       mtqc = TXGBE_PORTCTL_NUMVT_64;
+                       break;
+               case ETH_32_POOLS:
+                       mtqc = TXGBE_PORTCTL_NUMVT_32;
+                       break;
+               case ETH_16_POOLS:
+                       mtqc = TXGBE_PORTCTL_NUMVT_16;
+                       break;
+               default:
+                       mtqc = 0;
+                       PMD_INIT_LOG(ERR, "invalid pool number in IOV mode");
+               }
+               wr32m(hw, TXGBE_PORTCTL, TXGBE_PORTCTL_NUMVT_MASK, mtqc);
+       }
+
+       /* re-enable arbiter */
+       rttdcs &= ~TXGBE_ARBTXCTL_DIA;
+       wr32(hw, TXGBE_ARBTXCTL, rttdcs);
+
+       return 0;
+}
+
 /**
  * txgbe_get_rscctl_maxdesc
  *
@@ -1788,6 +3897,71 @@ txgbe_set_rsc(struct rte_eth_dev *dev)
        return 0;
 }
 
+void __rte_cold
+txgbe_set_rx_function(struct rte_eth_dev *dev)
+{
+       struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+       /*
+        * Initialize the appropriate LRO callback.
+        *
+        * If all queues satisfy the bulk allocation preconditions
+        * (adapter->rx_bulk_alloc_allowed is TRUE) then we may use
+        * bulk allocation. Otherwise use a single allocation version.
+        */
+       if (dev->data->lro) {
+               if (adapter->rx_bulk_alloc_allowed) {
+                       PMD_INIT_LOG(DEBUG, "LRO is requested. Using a bulk "
+                                          "allocation version");
+                       dev->rx_pkt_burst = txgbe_recv_pkts_lro_bulk_alloc;
+               } else {
+                       PMD_INIT_LOG(DEBUG, "LRO is requested. Using a single "
+                                          "allocation version");
+                       dev->rx_pkt_burst = txgbe_recv_pkts_lro_single_alloc;
+               }
+       } else if (dev->data->scattered_rx) {
+               /*
+                * Set the non-LRO scattered callback: there are bulk and
+                * single allocation versions.
+                */
+               if (adapter->rx_bulk_alloc_allowed) {
+                       PMD_INIT_LOG(DEBUG, "Using a Scattered with bulk "
+                                          "allocation callback (port=%d).",
+                                    dev->data->port_id);
+                       dev->rx_pkt_burst = txgbe_recv_pkts_lro_bulk_alloc;
+               } else {
+                       PMD_INIT_LOG(DEBUG, "Using Regular (non-vector, "
+                                           "single allocation) "
+                                           "Scattered Rx callback "
+                                           "(port=%d).",
+                                    dev->data->port_id);
+
+                       dev->rx_pkt_burst = txgbe_recv_pkts_lro_single_alloc;
+               }
+       /*
+        * Below we set "simple" callbacks according to port/queues parameters.
+        * If parameters allow we are going to choose between the following
+        * callbacks:
+        *    - Bulk Allocation
+        *    - Single buffer allocation (the simplest one)
+        */
+       } else if (adapter->rx_bulk_alloc_allowed) {
+               PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions are "
+                                   "satisfied. Rx Burst Bulk Alloc function "
+                                   "will be used on port=%d.",
+                            dev->data->port_id);
+
+               dev->rx_pkt_burst = txgbe_recv_pkts_bulk_alloc;
+       } else {
+               PMD_INIT_LOG(DEBUG, "Rx Burst Bulk Alloc Preconditions are not "
+                                   "satisfied, or Scattered Rx is requested "
+                                   "(port=%d).",
+                            dev->data->port_id);
+
+               dev->rx_pkt_burst = txgbe_recv_pkts;
+       }
+}
+
 /*
  * Initializes Receive Unit.
  */
@@ -1913,6 +4087,11 @@ txgbe_dev_rx_init(struct rte_eth_dev *dev)
        if (rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER)
                dev->data->scattered_rx = 1;
 
+       /*
+        * Device configured with multiple RX queues.
+        */
+       txgbe_dev_mq_rx_configure(dev);
+
        /*
         * Setup the Checksum Register.
         * Disable Full-Packet Checksum which is mutually exclusive with RSS.
@@ -1974,6 +4153,84 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)
                wr32(hw, TXGBE_TXRP(txq->reg_idx), 0);
                wr32(hw, TXGBE_TXWP(txq->reg_idx), 0);
        }
+
+       /* Device configured with multiple TX queues. */
+       txgbe_dev_mq_tx_configure(dev);
+}
+
+/*
+ * Set up link loopback mode Tx->Rx.
+ */
+static inline void __rte_cold
+txgbe_setup_loopback_link_raptor(struct txgbe_hw *hw)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       wr32m(hw, TXGBE_MACRXCFG, TXGBE_MACRXCFG_LB, TXGBE_MACRXCFG_LB);
+
+       msec_delay(50);
+}
+
+/*
+ * Start Transmit and Receive Units.
+ */
+int __rte_cold
+txgbe_dev_rxtx_start(struct rte_eth_dev *dev)
+{
+       struct txgbe_hw     *hw;
+       struct txgbe_tx_queue *txq;
+       struct txgbe_rx_queue *rxq;
+       uint32_t dmatxctl;
+       uint32_t rxctrl;
+       uint16_t i;
+       int ret = 0;
+
+       PMD_INIT_FUNC_TRACE();
+       hw = TXGBE_DEV_HW(dev);
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               txq = dev->data->tx_queues[i];
+               /* Setup Transmit Threshold Registers */
+               wr32m(hw, TXGBE_TXCFG(txq->reg_idx),
+                     TXGBE_TXCFG_HTHRESH_MASK |
+                     TXGBE_TXCFG_WTHRESH_MASK,
+                     TXGBE_TXCFG_HTHRESH(txq->hthresh) |
+                     TXGBE_TXCFG_WTHRESH(txq->wthresh));
+       }
+
+       dmatxctl = rd32(hw, TXGBE_DMATXCTRL);
+       dmatxctl |= TXGBE_DMATXCTRL_ENA;
+       wr32(hw, TXGBE_DMATXCTRL, dmatxctl);
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               txq = dev->data->tx_queues[i];
+               if (!txq->tx_deferred_start) {
+                       ret = txgbe_dev_tx_queue_start(dev, i);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
+       for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               rxq = dev->data->rx_queues[i];
+               if (!rxq->rx_deferred_start) {
+                       ret = txgbe_dev_rx_queue_start(dev, i);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
+       /* Enable Receive engine */
+       rxctrl = rd32(hw, TXGBE_PBRXCTL);
+       rxctrl |= TXGBE_PBRXCTL_ENA;
+       hw->mac.enable_rx_dma(hw, rxctrl);
+
+       /* If loopback mode is enabled, set up the link accordingly */
+       if (hw->mac.type == txgbe_mac_raptor &&
+           dev->data->dev_conf.lpbk_mode)
+               txgbe_setup_loopback_link_raptor(hw);
+
+       return 0;
 }
 
 void
@@ -2177,3 +4434,40 @@ txgbe_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
        return 0;
 }
 
+void
+txgbe_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+       struct rte_eth_rxq_info *qinfo)
+{
+       struct txgbe_rx_queue *rxq;
+
+       rxq = dev->data->rx_queues[queue_id];
+
+       qinfo->mp = rxq->mb_pool;
+       qinfo->scattered_rx = dev->data->scattered_rx;
+       qinfo->nb_desc = rxq->nb_rx_desc;
+
+       qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
+       qinfo->conf.rx_drop_en = rxq->drop_en;
+       qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
+       qinfo->conf.offloads = rxq->offloads;
+}
+
+void
+txgbe_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+       struct rte_eth_txq_info *qinfo)
+{
+       struct txgbe_tx_queue *txq;
+
+       txq = dev->data->tx_queues[queue_id];
+
+       qinfo->nb_desc = txq->nb_tx_desc;
+
+       qinfo->conf.tx_thresh.pthresh = txq->pthresh;
+       qinfo->conf.tx_thresh.hthresh = txq->hthresh;
+       qinfo->conf.tx_thresh.wthresh = txq->wthresh;
+
+       qinfo->conf.tx_free_thresh = txq->tx_free_thresh;
+       qinfo->conf.offloads = txq->offloads;
+       qinfo->conf.tx_deferred_start = txq->tx_deferred_start;
+}
+