net/ngbe: support Rx and Tx descriptor status
[dpdk.git] / drivers / net / ngbe / ngbe_rxtx.c
index d1b825d..1c799c8 100644 (file)
 #include "ngbe_ethdev.h"
 #include "ngbe_rxtx.h"
 
+#ifdef RTE_LIBRTE_IEEE1588
+#define NGBE_TX_IEEE1588_TMST PKT_TX_IEEE1588_TMST
+#else
+#define NGBE_TX_IEEE1588_TMST 0
+#endif
+
 /* Bit Mask to indicate what bits required for building Tx context */
 static const u64 NGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |
                RTE_MBUF_F_TX_OUTER_IPV6 |
                RTE_MBUF_F_TX_OUTER_IPV4 |
                RTE_MBUF_F_TX_IPV6 |
                RTE_MBUF_F_TX_IPV4 |
+               RTE_MBUF_F_TX_VLAN |
                RTE_MBUF_F_TX_L4_MASK |
                RTE_MBUF_F_TX_TCP_SEG |
                RTE_MBUF_F_TX_TUNNEL_MASK |
-               RTE_MBUF_F_TX_OUTER_IP_CKSUM);
+               RTE_MBUF_F_TX_OUTER_IP_CKSUM |
+               NGBE_TX_IEEE1588_TMST);
+
 #define NGBE_TX_OFFLOAD_NOTSUP_MASK \
                (RTE_MBUF_F_TX_OFFLOAD_MASK ^ NGBE_TX_OFFLOAD_MASK)
 
@@ -347,6 +356,11 @@ ngbe_set_xmit_ctx(struct ngbe_tx_queue *txq,
                vlan_macip_lens |= NGBE_TXD_MACLEN(tx_offload.l2_len);
        }
 
+       if (ol_flags & RTE_MBUF_F_TX_VLAN) {
+               tx_offload_mask.vlan_tci |= ~0;
+               vlan_macip_lens |= NGBE_TXD_VLAN(tx_offload.vlan_tci);
+       }
+
        txq->ctx_cache[ctx_idx].flags = ol_flags;
        txq->ctx_cache[ctx_idx].tx_offload.data[0] =
                tx_offload_mask.data[0] & tx_offload.data[0];
@@ -417,6 +431,8 @@ tx_desc_cksum_flags_to_olinfo(uint64_t ol_flags)
                        tmp |= NGBE_TXD_IPCS;
                tmp |= NGBE_TXD_L4CS;
        }
+       if (ol_flags & RTE_MBUF_F_TX_VLAN)
+               tmp |= NGBE_TXD_CC;
 
        return tmp;
 }
@@ -426,6 +442,8 @@ tx_desc_ol_flags_to_cmdtype(uint64_t ol_flags)
 {
        uint32_t cmdtype = 0;
 
+       if (ol_flags & RTE_MBUF_F_TX_VLAN)
+               cmdtype |= NGBE_TXD_VLE;
        if (ol_flags & RTE_MBUF_F_TX_TCP_SEG)
                cmdtype |= NGBE_TXD_TSE;
        return cmdtype;
@@ -444,6 +462,8 @@ tx_desc_ol_flags_to_ptid(uint64_t oflags, uint32_t ptype)
 
        /* L2 level */
        ptype = RTE_PTYPE_L2_ETHER;
+       if (oflags & RTE_MBUF_F_TX_VLAN)
+               ptype |= RTE_PTYPE_L2_ETHER_VLAN;
 
        /* L3 level */
        if (oflags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IP_CKSUM))
@@ -607,6 +627,7 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                        tx_offload.l2_len = tx_pkt->l2_len;
                        tx_offload.l3_len = tx_pkt->l3_len;
                        tx_offload.l4_len = tx_pkt->l4_len;
+                       tx_offload.vlan_tci = tx_pkt->vlan_tci;
                        tx_offload.tso_segsz = tx_pkt->tso_segsz;
                        tx_offload.outer_l2_len = tx_pkt->outer_l2_len;
                        tx_offload.outer_l3_len = tx_pkt->outer_l3_len;
@@ -718,6 +739,11 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                 */
                cmd_type_len = NGBE_TXD_FCS;
 
+#ifdef RTE_LIBRTE_IEEE1588
+               if (ol_flags & PKT_TX_IEEE1588_TMST)
+                       cmd_type_len |= NGBE_TXD_1588;
+#endif
+
                olinfo_status = 0;
                if (tx_ol_req) {
                        if (ol_flags & RTE_MBUF_F_TX_TCP_SEG) {
@@ -885,6 +911,52 @@ ngbe_rxd_pkt_info_to_pkt_type(uint32_t pkt_info, uint16_t ptid_mask)
        return ngbe_decode_ptype(ptid);
 }
 
+static inline uint64_t
+ngbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)
+{
+       static uint64_t ip_rss_types_map[16] __rte_cache_aligned = {
+               0, RTE_MBUF_F_RX_RSS_HASH, RTE_MBUF_F_RX_RSS_HASH, RTE_MBUF_F_RX_RSS_HASH,
+               0, RTE_MBUF_F_RX_RSS_HASH, 0, RTE_MBUF_F_RX_RSS_HASH,
+               RTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,
+               0, 0, 0,  RTE_MBUF_F_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 = ngbe_etflt_id(NGBE_RXD_PTID(pkt_info));
+       if (likely(-1 != etfid))
+               return ip_pkt_etqf_map[etfid] |
+                      ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];
+       else
+               return ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];
+#else
+       return ip_rss_types_map[NGBE_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 & NGBE_RXD_STAT_VLAN &&
+                    vlan_flags & RTE_MBUF_F_RX_VLAN_STRIPPED)
+                   ? vlan_flags : 0;
+
+#ifdef RTE_LIBRTE_IEEE1588
+       if (rx_status & NGBE_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)
 {
@@ -965,16 +1037,26 @@ ngbe_rx_scan_hw_ring(struct ngbe_rx_queue *rxq)
                /* 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);
+                       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_error_to_pkt_flags(s[j]);
+                       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 |=
+                               ngbe_rxd_pkt_info_to_pkt_flags(pkt_info[j]);
                        mb->ol_flags = pkt_flags;
                        mb->packet_type =
                                ngbe_rxd_pkt_info_to_pkt_type(pkt_info[j],
                                NGBE_PTID_MASK);
+
+                       if (likely(pkt_flags & RTE_MBUF_F_RX_RSS_HASH))
+                               mb->hash.rss =
+                                       rte_le_to_cpu_32(rxdp[j].qw0.dw1);
                }
 
                /* Move mbuf pointers from the S/W ring to the stage */
@@ -1265,10 +1347,13 @@ ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                 *    - 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));
+               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;
@@ -1278,11 +1363,20 @@ ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                rxm->port = rxq->port_id;
 
                pkt_info = rte_le_to_cpu_32(rxd.qw0.dw0);
-               pkt_flags = rx_desc_error_to_pkt_flags(staterr);
+               /* Only valid if RTE_MBUF_F_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 |= ngbe_rxd_pkt_info_to_pkt_flags(pkt_info);
                rxm->ol_flags = pkt_flags;
                rxm->packet_type = ngbe_rxd_pkt_info_to_pkt_type(pkt_info,
                                                       NGBE_PTID_MASK);
 
+               if (likely(pkt_flags & RTE_MBUF_F_RX_RSS_HASH))
+                       rxm->hash.rss = rte_le_to_cpu_32(rxd.qw0.dw1);
+
                /*
                 * Store the mbuf address into the next entry of the array
                 * of returned packets.
@@ -1322,7 +1416,9 @@ ngbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
  * 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
@@ -1337,11 +1433,20 @@ ngbe_fill_cluster_head_buf(struct rte_mbuf *head, struct ngbe_rx_desc *desc,
 
        head->port = rxq->port_id;
 
+       /* The vlan_tci field is only valid when RTE_MBUF_F_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_error_to_pkt_flags(staterr);
+       pkt_flags = rx_desc_status_to_pkt_flags(staterr, rxq->vlan_flags);
+       pkt_flags |= rx_desc_error_to_pkt_flags(staterr);
+       pkt_flags |= ngbe_rxd_pkt_info_to_pkt_flags(pkt_info);
        head->ol_flags = pkt_flags;
        head->packet_type = ngbe_rxd_pkt_info_to_pkt_type(pkt_info,
                                                NGBE_PTID_MASK);
+
+       if (likely(pkt_flags & RTE_MBUF_F_RX_RSS_HASH))
+               head->hash.rss = rte_le_to_cpu_32(desc->qw0.dw1);
 }
 
 /**
@@ -1518,6 +1623,22 @@ next_desc:
                /* Initialize the first mbuf of the returned packet */
                ngbe_fill_cluster_head_buf(first_seg, &rxd, rxq, staterr);
 
+               /* Deal with the case, when HW CRC srip is disabled. */
+               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);
@@ -1689,14 +1810,42 @@ ngbe_set_tx_function(struct rte_eth_dev *dev, struct ngbe_tx_queue *txq)
        }
 }
 
+static const struct {
+       eth_tx_burst_t pkt_burst;
+       const char *info;
+} ngbe_tx_burst_infos[] = {
+       { ngbe_xmit_pkts_simple,   "Scalar Simple"},
+       { ngbe_xmit_pkts,          "Scalar"},
+};
+
+int
+ngbe_tx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id,
+                     struct rte_eth_burst_mode *mode)
+{
+       eth_tx_burst_t pkt_burst = dev->tx_pkt_burst;
+       int ret = -EINVAL;
+       unsigned int i;
+
+       for (i = 0; i < RTE_DIM(ngbe_tx_burst_infos); ++i) {
+               if (pkt_burst == ngbe_tx_burst_infos[i].pkt_burst) {
+                       snprintf(mode->info, sizeof(mode->info), "%s",
+                                ngbe_tx_burst_infos[i].info);
+                       ret = 0;
+                       break;
+               }
+       }
+
+       return ret;
+}
+
 uint64_t
 ngbe_get_tx_port_offloads(struct rte_eth_dev *dev)
 {
        uint64_t tx_offload_capa;
-
-       RTE_SET_USED(dev);
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
 
        tx_offload_capa =
+               RTE_ETH_TX_OFFLOAD_VLAN_INSERT |
                RTE_ETH_TX_OFFLOAD_IPV4_CKSUM  |
                RTE_ETH_TX_OFFLOAD_UDP_CKSUM   |
                RTE_ETH_TX_OFFLOAD_TCP_CKSUM   |
@@ -1709,6 +1858,9 @@ ngbe_get_tx_port_offloads(struct rte_eth_dev *dev)
                RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO |
                RTE_ETH_TX_OFFLOAD_MULTI_SEGS;
 
+       if (hw->is_pf)
+               tx_offload_capa |= RTE_ETH_TX_OFFLOAD_QINQ_INSERT;
+
        return tx_offload_capa;
 }
 
@@ -1789,7 +1941,8 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev,
        txq->hthresh = tx_conf->tx_thresh.hthresh;
        txq->wthresh = tx_conf->tx_thresh.wthresh;
        txq->queue_id = queue_idx;
-       txq->reg_idx = queue_idx;
+       txq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ?
+               queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        txq->port_id = dev->data->port_id;
        txq->offloads = offloads;
        txq->ops = &def_txq_ops;
@@ -1979,15 +2132,28 @@ ngbe_reset_rx_queue(struct ngbe_adapter *adapter, struct ngbe_rx_queue *rxq)
 }
 
 uint64_t
-ngbe_get_rx_port_offloads(struct rte_eth_dev *dev __rte_unused)
+ngbe_get_rx_queue_offloads(struct rte_eth_dev *dev __rte_unused)
+{
+       return RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+}
+
+uint64_t
+ngbe_get_rx_port_offloads(struct rte_eth_dev *dev)
 {
        uint64_t offloads;
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
 
        offloads = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
                   RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
                   RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+                  RTE_ETH_RX_OFFLOAD_KEEP_CRC    |
+                  RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
                   RTE_ETH_RX_OFFLOAD_SCATTER;
 
+       if (hw->is_pf)
+               offloads |= (RTE_ETH_RX_OFFLOAD_QINQ_STRIP |
+                            RTE_ETH_RX_OFFLOAD_VLAN_EXTEND);
+
        return offloads;
 }
 
@@ -2004,10 +2170,13 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        struct ngbe_hw     *hw;
        uint16_t len;
        struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+       uint64_t offloads;
 
        PMD_INIT_FUNC_TRACE();
        hw = ngbe_dev_hw(dev);
 
+       offloads = rx_conf->offloads | dev->data->dev_conf.rxmode.offloads;
+
        /* Free memory prior to re-allocation if needed... */
        if (dev->data->rx_queues[queue_idx] != NULL) {
                ngbe_rx_queue_release(dev->data->rx_queues[queue_idx]);
@@ -2024,10 +2193,16 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        rxq->nb_rx_desc = nb_desc;
        rxq->rx_free_thresh = rx_conf->rx_free_thresh;
        rxq->queue_id = queue_idx;
-       rxq->reg_idx = queue_idx;
+       rxq->reg_idx = (uint16_t)((RTE_ETH_DEV_SRIOV(dev).active == 0) ?
+               queue_idx : RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx + queue_idx);
        rxq->port_id = dev->data->port_id;
+       if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
+               rxq->crc_len = RTE_ETHER_CRC_LEN;
+       else
+               rxq->crc_len = 0;
        rxq->drop_en = rx_conf->rx_drop_en;
        rxq->rx_deferred_start = rx_conf->rx_deferred_start;
+       rxq->offloads = offloads;
 
        /*
         * Allocate Rx ring hardware descriptors. A memzone large enough to
@@ -2110,6 +2285,78 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
+uint32_t
+ngbe_dev_rx_queue_count(void *rx_queue)
+{
+#define NGBE_RXQ_SCAN_INTERVAL 4
+       volatile struct ngbe_rx_desc *rxdp;
+       struct ngbe_rx_queue *rxq = rx_queue;
+       uint32_t desc = 0;
+
+       rxdp = &rxq->rx_ring[rxq->rx_tail];
+
+       while ((desc < rxq->nb_rx_desc) &&
+               (rxdp->qw1.lo.status &
+                       rte_cpu_to_le_32(NGBE_RXD_STAT_DD))) {
+               desc += NGBE_RXQ_SCAN_INTERVAL;
+               rxdp += NGBE_RXQ_SCAN_INTERVAL;
+               if (rxq->rx_tail + desc >= rxq->nb_rx_desc)
+                       rxdp = &(rxq->rx_ring[rxq->rx_tail +
+                               desc - rxq->nb_rx_desc]);
+       }
+
+       return desc;
+}
+
+int
+ngbe_dev_rx_descriptor_status(void *rx_queue, uint16_t offset)
+{
+       struct ngbe_rx_queue *rxq = rx_queue;
+       volatile uint32_t *status;
+       uint32_t nb_hold, desc;
+
+       if (unlikely(offset >= rxq->nb_rx_desc))
+               return -EINVAL;
+
+       nb_hold = rxq->nb_rx_hold;
+       if (offset >= rxq->nb_rx_desc - nb_hold)
+               return RTE_ETH_RX_DESC_UNAVAIL;
+
+       desc = rxq->rx_tail + offset;
+       if (desc >= rxq->nb_rx_desc)
+               desc -= rxq->nb_rx_desc;
+
+       status = &rxq->rx_ring[desc].qw1.lo.status;
+       if (*status & rte_cpu_to_le_32(NGBE_RXD_STAT_DD))
+               return RTE_ETH_RX_DESC_DONE;
+
+       return RTE_ETH_RX_DESC_AVAIL;
+}
+
+int
+ngbe_dev_tx_descriptor_status(void *tx_queue, uint16_t offset)
+{
+       struct ngbe_tx_queue *txq = tx_queue;
+       volatile uint32_t *status;
+       uint32_t desc;
+
+       if (unlikely(offset >= txq->nb_tx_desc))
+               return -EINVAL;
+
+       desc = txq->tx_tail + offset;
+       if (desc >= txq->nb_tx_desc) {
+               desc -= txq->nb_tx_desc;
+               if (desc >= txq->nb_tx_desc)
+                       desc -= txq->nb_tx_desc;
+       }
+
+       status = &txq->tx_ring[desc].dw3;
+       if (*status & rte_cpu_to_le_32(NGBE_TXD_DD))
+               return RTE_ETH_TX_DESC_DONE;
+
+       return RTE_ETH_TX_DESC_FULL;
+}
+
 void
 ngbe_dev_clear_queues(struct rte_eth_dev *dev)
 {
@@ -2157,6 +2404,222 @@ ngbe_dev_free_queues(struct rte_eth_dev *dev)
        dev->data->nb_tx_queues = 0;
 }
 
+/**
+ * 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
+ngbe_rss_disable(struct rte_eth_dev *dev)
+{
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+       wr32m(hw, NGBE_RACTL, NGBE_RACTL_RSSENA, 0);
+}
+
+int
+ngbe_dev_rss_hash_update(struct rte_eth_dev *dev,
+                         struct rte_eth_rss_conf *rss_conf)
+{
+       struct ngbe_hw *hw = ngbe_dev_hw(dev);
+       uint8_t  *hash_key;
+       uint32_t mrqc;
+       uint32_t rss_key;
+       uint64_t rss_hf;
+       uint16_t i;
+
+       if (!hw->is_pf) {
+               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, NGBE_REG_RSSKEY, i, rss_key);
+               }
+       }
+
+       /* Set configured hashing protocols */
+       rss_hf = rss_conf->rss_hf & NGBE_RSS_OFFLOAD_ALL;
+
+       mrqc = rd32(hw, NGBE_RACTL);
+       mrqc &= ~NGBE_RACTL_RSSMASK;
+       if (rss_hf & RTE_ETH_RSS_IPV4)
+               mrqc |= NGBE_RACTL_RSSIPV4;
+       if (rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_TCP)
+               mrqc |= NGBE_RACTL_RSSIPV4TCP;
+       if (rss_hf & RTE_ETH_RSS_IPV6 ||
+           rss_hf & RTE_ETH_RSS_IPV6_EX)
+               mrqc |= NGBE_RACTL_RSSIPV6;
+       if (rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_TCP ||
+           rss_hf & RTE_ETH_RSS_IPV6_TCP_EX)
+               mrqc |= NGBE_RACTL_RSSIPV6TCP;
+       if (rss_hf & RTE_ETH_RSS_NONFRAG_IPV4_UDP)
+               mrqc |= NGBE_RACTL_RSSIPV4UDP;
+       if (rss_hf & RTE_ETH_RSS_NONFRAG_IPV6_UDP ||
+           rss_hf & RTE_ETH_RSS_IPV6_UDP_EX)
+               mrqc |= NGBE_RACTL_RSSIPV6UDP;
+
+       if (rss_hf)
+               mrqc |= NGBE_RACTL_RSSENA;
+       else
+               mrqc &= ~NGBE_RACTL_RSSENA;
+
+       wr32(hw, NGBE_RACTL, mrqc);
+
+       return 0;
+}
+
+int
+ngbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+                           struct rte_eth_rss_conf *rss_conf)
+{
+       struct ngbe_hw *hw = ngbe_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, NGBE_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, NGBE_RACTL);
+       if (mrqc & NGBE_RACTL_RSSIPV4)
+               rss_hf |= RTE_ETH_RSS_IPV4;
+       if (mrqc & NGBE_RACTL_RSSIPV4TCP)
+               rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP;
+       if (mrqc & NGBE_RACTL_RSSIPV6)
+               rss_hf |= RTE_ETH_RSS_IPV6 |
+                         RTE_ETH_RSS_IPV6_EX;
+       if (mrqc & NGBE_RACTL_RSSIPV6TCP)
+               rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_TCP |
+                         RTE_ETH_RSS_IPV6_TCP_EX;
+       if (mrqc & NGBE_RACTL_RSSIPV4UDP)
+               rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP;
+       if (mrqc & NGBE_RACTL_RSSIPV6UDP)
+               rss_hf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP |
+                         RTE_ETH_RSS_IPV6_UDP_EX;
+       if (!(mrqc & NGBE_RACTL_RSSENA))
+               rss_hf = 0;
+
+       rss_hf &= NGBE_RSS_OFFLOAD_ALL;
+
+       rss_conf->rss_hf = rss_hf;
+       return 0;
+}
+
+static void
+ngbe_rss_configure(struct rte_eth_dev *dev)
+{
+       struct rte_eth_rss_conf rss_conf;
+       struct ngbe_adapter *adapter = ngbe_dev_adapter(dev);
+       struct ngbe_hw *hw = ngbe_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 < RTE_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, NGBE_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 */
+       ngbe_dev_rss_hash_update(dev, &rss_conf);
+}
+
+void ngbe_configure_port(struct rte_eth_dev *dev)
+{
+       struct ngbe_hw *hw = ngbe_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, NGBE_EXTAG,
+               NGBE_EXTAG_ETAG(RTE_ETHER_TYPE_ETAG) |
+               NGBE_EXTAG_VLAN(RTE_ETHER_TYPE_QINQ));
+
+       /* default inner vlan tpid */
+       wr32m(hw, NGBE_VLANCTL,
+               NGBE_VLANCTL_TPID_MASK,
+               NGBE_VLANCTL_TPID(RTE_ETHER_TYPE_VLAN));
+       wr32m(hw, NGBE_DMATXCTRL,
+               NGBE_DMATXCTRL_TPID_MASK,
+               NGBE_DMATXCTRL_TPID(RTE_ETHER_TYPE_VLAN));
+
+       /* default vlan tpid filters */
+       for (i = 0; i < 8; i++) {
+               wr32m(hw, NGBE_TAGTPID(i / 2),
+                       (i % 2 ? NGBE_TAGTPID_MSB_MASK
+                              : NGBE_TAGTPID_LSB_MASK),
+                       (i % 2 ? NGBE_TAGTPID_MSB(tpids[i])
+                              : NGBE_TAGTPID_LSB(tpids[i])));
+       }
+}
+
 static int
 ngbe_alloc_rx_queue_mbufs(struct ngbe_rx_queue *rxq)
 {
@@ -2191,6 +2654,26 @@ ngbe_alloc_rx_queue_mbufs(struct ngbe_rx_queue *rxq)
        return 0;
 }
 
+static int
+ngbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
+{
+       if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
+               switch (dev->data->dev_conf.rxmode.mq_mode) {
+               case RTE_ETH_MQ_RX_RSS:
+                       ngbe_rss_configure(dev);
+                       break;
+
+               case RTE_ETH_MQ_RX_NONE:
+               default:
+                       /* if mq_mode is none, disable rss mode.*/
+                       ngbe_rss_disable(dev);
+                       break;
+               }
+       }
+
+       return 0;
+}
+
 void
 ngbe_set_rx_function(struct rte_eth_dev *dev)
 {
@@ -2239,6 +2722,36 @@ ngbe_set_rx_function(struct rte_eth_dev *dev)
        }
 }
 
+static const struct {
+       eth_rx_burst_t pkt_burst;
+       const char *info;
+} ngbe_rx_burst_infos[] = {
+       { ngbe_recv_pkts_sc_single_alloc,    "Scalar Scattered"},
+       { ngbe_recv_pkts_sc_bulk_alloc,      "Scalar Scattered Bulk Alloc"},
+       { ngbe_recv_pkts_bulk_alloc,         "Scalar Bulk Alloc"},
+       { ngbe_recv_pkts,                    "Scalar"},
+};
+
+int
+ngbe_rx_burst_mode_get(struct rte_eth_dev *dev, __rte_unused uint16_t queue_id,
+                     struct rte_eth_burst_mode *mode)
+{
+       eth_rx_burst_t pkt_burst = dev->rx_pkt_burst;
+       int ret = -EINVAL;
+       unsigned int i;
+
+       for (i = 0; i < RTE_DIM(ngbe_rx_burst_infos); ++i) {
+               if (pkt_burst == ngbe_rx_burst_infos[i].pkt_burst) {
+                       snprintf(mode->info, sizeof(mode->info), "%s",
+                                ngbe_rx_burst_infos[i].info);
+                       ret = 0;
+                       break;
+               }
+       }
+
+       return ret;
+}
+
 /*
  * Initializes Receive Unit.
  */
@@ -2251,6 +2764,7 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
        uint32_t fctrl;
        uint32_t hlreg0;
        uint32_t srrctl;
+       uint32_t rdrxctl;
        uint32_t rxcsum;
        uint16_t buf_size;
        uint16_t i;
@@ -2271,17 +2785,53 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
        fctrl |= NGBE_PSRCTL_BCA;
        wr32(hw, NGBE_PSRCTL, fctrl);
 
+       /*
+        * Configure CRC stripping, if any.
+        */
        hlreg0 = rd32(hw, NGBE_SECRXCTL);
+       if (rx_conf->offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
+               hlreg0 &= ~NGBE_SECRXCTL_CRCSTRIP;
+       else
+               hlreg0 |= NGBE_SECRXCTL_CRCSTRIP;
        hlreg0 &= ~NGBE_SECRXCTL_XDSA;
        wr32(hw, NGBE_SECRXCTL, hlreg0);
 
+       /*
+        * Configure jumbo frame support, if any.
+        */
        wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK,
-                       NGBE_FRMSZ_MAX(NGBE_FRAME_SIZE_DFT));
+               NGBE_FRMSZ_MAX(dev->data->mtu + NGBE_ETH_OVERHEAD));
+
+       /*
+        * If loopback mode is configured, set LPBK bit.
+        */
+       hlreg0 = rd32(hw, NGBE_PSRCTL);
+       if (hw->is_pf && dev->data->dev_conf.lpbk_mode)
+               hlreg0 |= NGBE_PSRCTL_LBENA;
+       else
+               hlreg0 &= ~NGBE_PSRCTL_LBENA;
+
+       wr32(hw, NGBE_PSRCTL, hlreg0);
+
+       /*
+        * Assume no header split and no VLAN strip support
+        * on any Rx queue first .
+        */
+       rx_conf->offloads &= ~RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
 
        /* Setup Rx queues */
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
                rxq = dev->data->rx_queues[i];
 
+               /*
+                * Reset crc_len in case it was changed after queue setup by a
+                * call to configure.
+                */
+               if (rx_conf->offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
+                       rxq->crc_len = RTE_ETHER_CRC_LEN;
+               else
+                       rxq->crc_len = 0;
+
                /* Setup the Base and Length of the Rx Descriptor Rings */
                bus_addr = rxq->rx_ring_phys_addr;
                wr32(hw, NGBE_RXBAL(rxq->reg_idx),
@@ -2309,12 +2859,26 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
                srrctl |= NGBE_RXCFG_PKTLEN(buf_size);
 
                wr32(hw, NGBE_RXCFG(rxq->reg_idx), srrctl);
+
+               /* It adds dual VLAN length for supporting dual VLAN */
+               if (dev->data->mtu + NGBE_ETH_OVERHEAD +
+                               2 * NGBE_VLAN_TAG_SIZE > buf_size)
+                       dev->data->scattered_rx = 1;
+               if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
+                       rx_conf->offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
        }
 
        if (rx_conf->offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
                dev->data->scattered_rx = 1;
+
+       /*
+        * Device configured with multiple RX queues.
+        */
+       ngbe_dev_mq_rx_configure(dev);
+
        /*
         * Setup the Checksum Register.
+        * Disable Full-Packet Checksum which is mutually exclusive with RSS.
         * Enable IP/L4 checksum computation by hardware if requested to do so.
         */
        rxcsum = rd32(hw, NGBE_PSRCTL);
@@ -2326,6 +2890,15 @@ ngbe_dev_rx_init(struct rte_eth_dev *dev)
 
        wr32(hw, NGBE_PSRCTL, rxcsum);
 
+       if (hw->is_pf) {
+               rdrxctl = rd32(hw, NGBE_SECRXCTL);
+               if (rx_conf->offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
+                       rdrxctl &= ~NGBE_SECRXCTL_CRCSTRIP;
+               else
+                       rdrxctl |= NGBE_SECRXCTL_CRCSTRIP;
+               wr32(hw, NGBE_SECRXCTL, rdrxctl);
+       }
+
        ngbe_set_rx_function(dev);
 
        return 0;
@@ -2365,6 +2938,19 @@ ngbe_dev_tx_init(struct rte_eth_dev *dev)
        }
 }
 
+/*
+ * Set up link loopback mode Tx->Rx.
+ */
+static inline void
+ngbe_setup_loopback_link(struct ngbe_hw *hw)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       wr32m(hw, NGBE_MACRXCFG, NGBE_MACRXCFG_LB, NGBE_MACRXCFG_LB);
+
+       msec_delay(50);
+}
+
 /*
  * Start Transmit and Receive Units.
  */
@@ -2419,6 +3005,10 @@ ngbe_dev_rxtx_start(struct rte_eth_dev *dev)
        rxctrl |= NGBE_PBRXCTL_ENA;
        hw->mac.enable_rx_dma(hw, rxctrl);
 
+       /* If loopback mode is enabled, set up the link accordingly */
+       if (hw->is_pf && dev->data->dev_conf.lpbk_mode)
+               ngbe_setup_loopback_link(hw);
+
        return 0;
 }
 
@@ -2621,3 +3211,40 @@ ngbe_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 
        return 0;
 }
+
+void
+ngbe_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+       struct rte_eth_rxq_info *qinfo)
+{
+       struct ngbe_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
+ngbe_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
+       struct rte_eth_txq_info *qinfo)
+{
+       struct ngbe_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;
+}