i40e: support AQ based RSS config
[dpdk.git] / drivers / net / i40e / i40e_ethdev.c
index db642a5..5a9f11d 100644 (file)
@@ -56,6 +56,7 @@
 #include "base/i40e_adminq_cmd.h"
 #include "base/i40e_type.h"
 #include "base/i40e_register.h"
+#include "base/i40e_dcb.h"
 #include "i40e_ethdev.h"
 #include "i40e_rxtx.h"
 #include "i40e_pf.h"
 
 #define I40E_PRE_TX_Q_CFG_WAIT_US       10 /* 10 us */
 
+/* Flow control default timer */
+#define I40E_DEFAULT_PAUSE_TIME 0xFFFFU
+
+/* Flow control default high water */
+#define I40E_DEFAULT_HIGH_WATER (0x1C40/1024)
+
+/* Flow control default low water */
+#define I40E_DEFAULT_LOW_WATER  (0x1A40/1024)
+
+/* Flow control enable fwd bit */
+#define I40E_PRTMAC_FWD_CTRL   0x00000001
+
+/* Receive Packet Buffer size */
+#define I40E_RXPBSIZE (968 * 1024)
+
+/* Kilobytes shift */
+#define I40E_KILOSHIFT 10
+
+/* Receive Average Packet Size in Byte*/
+#define I40E_PACKET_AVERAGE_SIZE 128
+
 /* Mask of PF interrupt causes */
 #define I40E_PFINT_ICR0_ENA_MASK ( \
                I40E_PFINT_ICR0_ENA_ECC_ERR_MASK | \
 #define I40E_PRTTSYN_TSYNENA  0x80000000
 #define I40E_PRTTSYN_TSYNTYPE 0x0e000000
 
+#define I40E_MAX_PERCENT            100
+#define I40E_DEFAULT_DCB_APP_NUM    1
+#define I40E_DEFAULT_DCB_APP_PRIO   3
+
 static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev);
+static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev);
 static int i40e_dev_configure(struct rte_eth_dev *dev);
 static int i40e_dev_start(struct rte_eth_dev *dev);
 static void i40e_dev_stop(struct rte_eth_dev *dev);
@@ -126,7 +153,10 @@ static int i40e_dev_set_link_up(struct rte_eth_dev *dev);
 static int i40e_dev_set_link_down(struct rte_eth_dev *dev);
 static void i40e_dev_stats_get(struct rte_eth_dev *dev,
                               struct rte_eth_stats *stats);
+static int i40e_dev_xstats_get(struct rte_eth_dev *dev,
+                              struct rte_eth_xstats *xstats, unsigned n);
 static void i40e_dev_stats_reset(struct rte_eth_dev *dev);
+static void i40e_dev_xstats_reset(struct rte_eth_dev *dev);
 static int i40e_dev_queue_stats_mapping_set(struct rte_eth_dev *dev,
                                            uint16_t queue_id,
                                            uint8_t stat_idx,
@@ -144,6 +174,8 @@ static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev,
 static int i40e_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t pvid, int on);
 static int i40e_dev_led_on(struct rte_eth_dev *dev);
 static int i40e_dev_led_off(struct rte_eth_dev *dev);
+static int i40e_flow_ctrl_get(struct rte_eth_dev *dev,
+                             struct rte_eth_fc_conf *fc_conf);
 static int i40e_flow_ctrl_set(struct rte_eth_dev *dev,
                              struct rte_eth_fc_conf *fc_conf);
 static int i40e_priority_flow_ctrl_set(struct rte_eth_dev *dev,
@@ -165,6 +197,8 @@ static int i40e_pf_parameter_init(struct rte_eth_dev *dev);
 static int i40e_pf_setup(struct i40e_pf *pf);
 static int i40e_dev_rxtx_init(struct i40e_pf *pf);
 static int i40e_vmdq_setup(struct rte_eth_dev *dev);
+static int i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb);
+static int i40e_dcb_setup(struct rte_eth_dev *dev);
 static void i40e_stat_update_32(struct i40e_hw *hw, uint32_t reg,
                bool offset_loaded, uint64_t *offset, uint64_t *stat);
 static void i40e_stat_update_48(struct i40e_hw *hw,
@@ -216,6 +250,8 @@ static int i40e_dev_filter_ctrl(struct rte_eth_dev *dev,
                                enum rte_filter_type filter_type,
                                enum rte_filter_op filter_op,
                                void *arg);
+static int i40e_dev_get_dcb_info(struct rte_eth_dev *dev,
+                                 struct rte_eth_dcb_info *dcb_info);
 static void i40e_configure_registers(struct i40e_hw *hw);
 static void i40e_hw_init(struct i40e_hw *hw);
 static int i40e_config_qinq(struct i40e_hw *hw, struct i40e_vsi *vsi);
@@ -231,6 +267,8 @@ static int i40e_timesync_read_rx_timestamp(struct rte_eth_dev *dev,
                                           uint32_t flags);
 static int i40e_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
                                           struct timespec *timestamp);
+static void i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw);
+
 
 static const struct rte_pci_id pci_id_i40e_map[] = {
 #define RTE_PCI_DEV_ID_DECL_I40E(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
@@ -251,7 +289,9 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
        .dev_set_link_down            = i40e_dev_set_link_down,
        .link_update                  = i40e_dev_link_update,
        .stats_get                    = i40e_dev_stats_get,
+       .xstats_get                   = i40e_dev_xstats_get,
        .stats_reset                  = i40e_dev_stats_reset,
+       .xstats_reset                 = i40e_dev_xstats_reset,
        .queue_stats_mapping_set      = i40e_dev_queue_stats_mapping_set,
        .dev_infos_get                = i40e_dev_info_get,
        .vlan_filter_set              = i40e_vlan_filter_set,
@@ -271,6 +311,7 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
        .tx_queue_release             = i40e_dev_tx_queue_release,
        .dev_led_on                   = i40e_dev_led_on,
        .dev_led_off                  = i40e_dev_led_off,
+       .flow_ctrl_get                = i40e_flow_ctrl_get,
        .flow_ctrl_set                = i40e_flow_ctrl_set,
        .priority_flow_ctrl_set       = i40e_priority_flow_ctrl_set,
        .mac_addr_add                 = i40e_macaddr_add,
@@ -282,32 +323,124 @@ static const struct eth_dev_ops i40e_eth_dev_ops = {
        .udp_tunnel_add               = i40e_dev_udp_tunnel_add,
        .udp_tunnel_del               = i40e_dev_udp_tunnel_del,
        .filter_ctrl                  = i40e_dev_filter_ctrl,
+       .rxq_info_get                 = i40e_rxq_info_get,
+       .txq_info_get                 = i40e_txq_info_get,
        .mirror_rule_set              = i40e_mirror_rule_set,
        .mirror_rule_reset            = i40e_mirror_rule_reset,
        .timesync_enable              = i40e_timesync_enable,
        .timesync_disable             = i40e_timesync_disable,
        .timesync_read_rx_timestamp   = i40e_timesync_read_rx_timestamp,
        .timesync_read_tx_timestamp   = i40e_timesync_read_tx_timestamp,
+       .get_dcb_info                 = i40e_dev_get_dcb_info,
+};
+
+/* store statistics names and its offset in stats structure */
+struct rte_i40e_xstats_name_off {
+       char name[RTE_ETH_XSTATS_NAME_SIZE];
+       unsigned offset;
+};
+
+static const struct rte_i40e_xstats_name_off rte_i40e_stats_strings[] = {
+       {"rx_unicast_packets", offsetof(struct i40e_eth_stats, rx_unicast)},
+       {"rx_multicast_packets", offsetof(struct i40e_eth_stats, rx_multicast)},
+       {"rx_broadcast_packets", offsetof(struct i40e_eth_stats, rx_broadcast)},
+       {"rx_dropped", offsetof(struct i40e_eth_stats, rx_discards)},
+       {"rx_unknown_protocol_packets", offsetof(struct i40e_eth_stats,
+               rx_unknown_protocol)},
+       {"tx_unicast_packets", offsetof(struct i40e_eth_stats, tx_unicast)},
+       {"tx_multicast_packets", offsetof(struct i40e_eth_stats, tx_multicast)},
+       {"tx_broadcast_packets", offsetof(struct i40e_eth_stats, tx_broadcast)},
+       {"tx_dropped", offsetof(struct i40e_eth_stats, tx_discards)},
+};
+
+static const struct rte_i40e_xstats_name_off rte_i40e_hw_port_strings[] = {
+       {"tx_link_down_dropped", offsetof(struct i40e_hw_port_stats,
+               tx_dropped_link_down)},
+       {"rx_crc_errors", offsetof(struct i40e_hw_port_stats, crc_errors)},
+       {"rx_illegal_byte_errors", offsetof(struct i40e_hw_port_stats,
+               illegal_bytes)},
+       {"rx_error_bytes", offsetof(struct i40e_hw_port_stats, error_bytes)},
+       {"mac_local_errors", offsetof(struct i40e_hw_port_stats,
+               mac_local_faults)},
+       {"mac_remote_errors", offsetof(struct i40e_hw_port_stats,
+               mac_remote_faults)},
+       {"rx_length_errors", offsetof(struct i40e_hw_port_stats,
+               rx_length_errors)},
+       {"tx_xon_packets", offsetof(struct i40e_hw_port_stats, link_xon_tx)},
+       {"rx_xon_packets", offsetof(struct i40e_hw_port_stats, link_xon_rx)},
+       {"tx_xoff_packets", offsetof(struct i40e_hw_port_stats, link_xoff_tx)},
+       {"rx_xoff_packets", offsetof(struct i40e_hw_port_stats, link_xoff_rx)},
+       {"rx_size_64_packets", offsetof(struct i40e_hw_port_stats, rx_size_64)},
+       {"rx_size_65_to_127_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_127)},
+       {"rx_size_128_to_255_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_255)},
+       {"rx_size_256_to_511_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_511)},
+       {"rx_size_512_to_1023_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_1023)},
+       {"rx_size_1024_to_1522_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_1522)},
+       {"rx_size_1523_to_max_packets", offsetof(struct i40e_hw_port_stats,
+               rx_size_big)},
+       {"rx_undersized_errors", offsetof(struct i40e_hw_port_stats,
+               rx_undersize)},
+       {"rx_oversize_errors", offsetof(struct i40e_hw_port_stats,
+               rx_oversize)},
+       {"rx_mac_short_dropped", offsetof(struct i40e_hw_port_stats,
+               mac_short_packet_dropped)},
+       {"rx_fragmented_errors", offsetof(struct i40e_hw_port_stats,
+               rx_fragments)},
+       {"rx_jabber_errors", offsetof(struct i40e_hw_port_stats, rx_jabber)},
+       {"tx_size_64_packets", offsetof(struct i40e_hw_port_stats, tx_size_64)},
+       {"tx_size_65_to_127_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_127)},
+       {"tx_size_128_to_255_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_255)},
+       {"tx_size_256_to_511_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_511)},
+       {"tx_size_512_to_1023_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_1023)},
+       {"tx_size_1024_to_1522_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_1522)},
+       {"tx_size_1523_to_max_packets", offsetof(struct i40e_hw_port_stats,
+               tx_size_big)},
+       {"rx_flow_director_atr_match_packets",
+               offsetof(struct i40e_hw_port_stats, fd_atr_match)},
+       {"rx_flow_director_sb_match_packets",
+               offsetof(struct i40e_hw_port_stats, fd_sb_match)},
+       {"tx_low_power_idle_status", offsetof(struct i40e_hw_port_stats,
+               tx_lpi_status)},
+       {"rx_low_power_idle_status", offsetof(struct i40e_hw_port_stats,
+               rx_lpi_status)},
+       {"tx_low_power_idle_count", offsetof(struct i40e_hw_port_stats,
+               tx_lpi_count)},
+       {"rx_low_power_idle_count", offsetof(struct i40e_hw_port_stats,
+               rx_lpi_count)},
 };
 
+/* Q Stats: 5 stats are exposed for each queue, implemented in xstats_get() */
+#define I40E_NB_HW_PORT_Q_STATS (8 * 5)
+
+#define I40E_NB_ETH_XSTATS (sizeof(rte_i40e_stats_strings) / \
+               sizeof(rte_i40e_stats_strings[0]))
+#define I40E_NB_HW_PORT_XSTATS (sizeof(rte_i40e_hw_port_strings) / \
+               sizeof(rte_i40e_hw_port_strings[0]))
+#define I40E_NB_XSTATS (I40E_NB_ETH_XSTATS + I40E_NB_HW_PORT_XSTATS + \
+               I40E_NB_HW_PORT_Q_STATS)
+
 static struct eth_driver rte_i40e_pmd = {
        .pci_drv = {
                .name = "rte_i40e_pmd",
                .id_table = pci_id_i40e_map,
-               .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+               .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
+                       RTE_PCI_DRV_DETACHABLE,
        },
        .eth_dev_init = eth_i40e_dev_init,
+       .eth_dev_uninit = eth_i40e_dev_uninit,
        .dev_private_size = sizeof(struct i40e_adapter),
 };
 
-static inline int
-i40e_align_floor(int n)
-{
-       if (n == 0)
-               return 0;
-       return (1 << (sizeof(n) * CHAR_BIT - 1 - __builtin_clz(n)));
-}
-
 static inline int
 rte_i40e_dev_atomic_read_link_status(struct rte_eth_dev *dev,
                                     struct rte_eth_link *link)
@@ -387,6 +520,30 @@ static inline void i40e_flex_payload_reg_init(struct i40e_hw *hw)
        I40E_WRITE_REG(hw, I40E_GLQF_PIT(17), 0x00007440);
 }
 
+#define I40E_FLOW_CONTROL_ETHERTYPE  0x8808
+
+/*
+ * Add a ethertype filter to drop all flow control frames transmitted
+ * from VSIs.
+*/
+static void
+i40e_add_tx_flow_control_drop_filter(struct i40e_pf *pf)
+{
+       struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+       uint16_t flags = I40E_AQC_ADD_CONTROL_PACKET_FLAGS_IGNORE_MAC |
+                       I40E_AQC_ADD_CONTROL_PACKET_FLAGS_DROP |
+                       I40E_AQC_ADD_CONTROL_PACKET_FLAGS_TX;
+       int ret;
+
+       ret = i40e_aq_add_rem_control_packet_filter(hw, NULL,
+                               I40E_FLOW_CONTROL_ETHERTYPE, flags,
+                               pf->main_vsi_seid, 0,
+                               TRUE, NULL, NULL);
+       if (ret)
+               PMD_INIT_LOG(ERR, "Failed to add filter to drop flow control "
+                                 " frames from VSIs.");
+}
+
 static int
 eth_i40e_dev_init(struct rte_eth_dev *dev)
 {
@@ -408,8 +565,8 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
         * has already done this work. Only check we don't need a different
         * RX function */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY){
-               if (dev->data->scattered_rx)
-                       dev->rx_pkt_burst = i40e_recv_scattered_pkts;
+               i40e_set_rx_function(dev);
+               i40e_set_tx_function(dev);
                return 0;
        }
        pci_dev = dev->pci_dev;
@@ -431,6 +588,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
        hw->subsystem_device_id = pci_dev->id.subsystem_device_id;
        hw->bus.device = pci_dev->addr.devid;
        hw->bus.func = pci_dev->addr.function;
+       hw->adapter_stopped = 0;
 
        /* Make sure all is clean before doing PF reset */
        i40e_clear_hw(hw);
@@ -473,11 +631,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
                     ((hw->nvm.version >> 4) & 0xff),
                     (hw->nvm.version & 0xf), hw->nvm.eetrack);
 
-       /* Disable LLDP */
-       ret = i40e_aq_stop_lldp(hw, true, NULL);
-       if (ret != I40E_SUCCESS) /* Its failure can be ignored */
-               PMD_INIT_LOG(INFO, "Failed to stop lldp");
-
        /* Clear PXE mode */
        i40e_clear_pxe_mode(hw);
 
@@ -588,10 +741,23 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
 
        /* enable uio intr after callback register */
        rte_intr_enable(&(pci_dev->intr_handle));
+       /*
+        * Add an ethertype filter to drop all flow control frames transmitted
+        * from VSIs. By doing so, we stop VF from sending out PAUSE or PFC
+        * frames to wire.
+        */
+       i40e_add_tx_flow_control_drop_filter(pf);
 
        /* initialize mirror rule list */
        TAILQ_INIT(&pf->mirror_list);
 
+       /* Init dcb to sw mode by default */
+       ret = i40e_dcb_init_configure(dev, TRUE);
+       if (ret != I40E_SUCCESS) {
+               PMD_INIT_LOG(INFO, "Failed to init dcb.");
+               pf->flags &= ~I40E_FLAG_DCB;
+       }
+
        return 0;
 
 err_mac_alloc:
@@ -612,12 +778,81 @@ err_get_capabilities:
        return ret;
 }
 
+static int
+eth_i40e_dev_uninit(struct rte_eth_dev *dev)
+{
+       struct rte_pci_device *pci_dev;
+       struct i40e_hw *hw;
+       struct i40e_filter_control_settings settings;
+       int ret;
+       uint8_t aq_fail = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       pci_dev = dev->pci_dev;
+
+       if (hw->adapter_stopped == 0)
+               i40e_dev_close(dev);
+
+       dev->dev_ops = NULL;
+       dev->rx_pkt_burst = NULL;
+       dev->tx_pkt_burst = NULL;
+
+       /* Disable LLDP */
+       ret = i40e_aq_stop_lldp(hw, true, NULL);
+       if (ret != I40E_SUCCESS) /* Its failure can be ignored */
+               PMD_INIT_LOG(INFO, "Failed to stop lldp");
+
+       /* Clear PXE mode */
+       i40e_clear_pxe_mode(hw);
+
+       /* Unconfigure filter control */
+       memset(&settings, 0, sizeof(settings));
+       ret = i40e_set_filter_control(hw, &settings);
+       if (ret)
+               PMD_INIT_LOG(WARNING, "setup_pf_filter_control failed: %d",
+                                       ret);
+
+       /* Disable flow control */
+       hw->fc.requested_mode = I40E_FC_NONE;
+       i40e_set_fc(hw, &aq_fail, TRUE);
+
+       /* uninitialize pf host driver */
+       i40e_pf_host_uninit(dev);
+
+       rte_free(dev->data->mac_addrs);
+       dev->data->mac_addrs = NULL;
+
+       /* disable uio intr before callback unregister */
+       rte_intr_disable(&(pci_dev->intr_handle));
+
+       /* register callback func to eal lib */
+       rte_intr_callback_unregister(&(pci_dev->intr_handle),
+               i40e_dev_interrupt_handler, (void *)dev);
+
+       return 0;
+}
+
 static int
 i40e_dev_configure(struct rte_eth_dev *dev)
 {
+       struct i40e_adapter *ad =
+               I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        enum rte_eth_rx_mq_mode mq_mode = dev->data->dev_conf.rxmode.mq_mode;
-       int ret;
+       int i, ret;
+
+       /* Initialize to TRUE. If any of Rx queues doesn't meet the
+        * bulk allocation or vector Rx preconditions we will reset it.
+        */
+       ad->rx_bulk_alloc_allowed = true;
+       ad->rx_vec_allowed = true;
+       ad->tx_simple_allowed = true;
+       ad->tx_vec_allowed = true;
 
        if (dev->data->dev_conf.fdir_conf.mode == RTE_FDIR_MODE_PERFECT) {
                ret = i40e_fdir_setup(pf);
@@ -654,8 +889,27 @@ i40e_dev_configure(struct rte_eth_dev *dev)
                if (ret)
                        goto err;
        }
+
+       if (mq_mode & ETH_MQ_RX_DCB_FLAG) {
+               ret = i40e_dcb_setup(dev);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "failed to configure DCB.");
+                       goto err_dcb;
+               }
+       }
+
        return 0;
+
+err_dcb:
+       /* need to release vmdq resource if exists */
+       for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
+               i40e_vsi_release(pf->vmdq[i].vsi);
+               pf->vmdq[i].vsi = NULL;
+       }
+       rte_free(pf->vmdq);
+       pf->vmdq = NULL;
 err:
+       /* need to release fdir resource if exists */
        i40e_fdir_teardown(pf);
        return ret;
 }
@@ -887,6 +1141,8 @@ i40e_dev_start(struct rte_eth_dev *dev)
        struct i40e_vsi *main_vsi = pf->main_vsi;
        int ret, i;
 
+       hw->adapter_stopped = 0;
+
        if ((dev->data->dev_conf.link_duplex != ETH_LINK_AUTONEG_DUPLEX) &&
                (dev->data->dev_conf.link_duplex != ETH_LINK_FULL_DUPLEX)) {
                PMD_INIT_LOG(ERR, "Invalid link_duplex (%hu) for port %hhu",
@@ -998,10 +1254,13 @@ i40e_dev_close(struct rte_eth_dev *dev)
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t reg;
+       int i;
 
        PMD_INIT_FUNC_TRACE();
 
        i40e_dev_stop(dev);
+       hw->adapter_stopped = 1;
+       i40e_dev_free_queues(dev);
 
        /* Disable interrupt */
        i40e_pf_disable_irq0(hw);
@@ -1014,6 +1273,14 @@ i40e_dev_close(struct rte_eth_dev *dev)
        i40e_fdir_teardown(pf);
        i40e_vsi_release(pf->main_vsi);
 
+       for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
+               i40e_vsi_release(pf->vmdq[i].vsi);
+               pf->vmdq[i].vsi = NULL;
+       }
+
+       rte_free(pf->vmdq);
+       pf->vmdq = NULL;
+
        /* shutdown the adminq */
        i40e_aq_queue_shutdown(hw, true);
        i40e_shutdown_adminq(hw);
@@ -1254,16 +1521,12 @@ i40e_update_vsi_stats(struct i40e_vsi *vsi)
                    vsi->vsi_id);
 }
 
-/* Get all statistics of a port */
 static void
-i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+i40e_read_stats_registers(struct i40e_pf *pf, struct i40e_hw *hw)
 {
-       uint32_t i;
-       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       unsigned int i;
        struct i40e_hw_port_stats *ns = &pf->stats; /* new stats */
        struct i40e_hw_port_stats *os = &pf->stats_offset; /* old stats */
-
        /* Get statistics of struct i40e_eth_stats */
        i40e_stat_update_48(hw, I40E_GLPRT_GORCH(hw->port),
                            I40E_GLPRT_GORCL(hw->port),
@@ -1442,6 +1705,19 @@ i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
        if (pf->main_vsi)
                i40e_update_vsi_stats(pf->main_vsi);
+}
+
+/* Get all statistics of a port */
+static void
+i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct i40e_hw_port_stats *ns = &pf->stats; /* new stats */
+       unsigned i;
+
+       /* call read registers - updates values, now write them to struct */
+       i40e_read_stats_registers(pf, hw);
 
        stats->ipackets = ns->eth.rx_unicast + ns->eth.rx_multicast +
                                                ns->eth.rx_broadcast;
@@ -1531,6 +1807,98 @@ i40e_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        PMD_DRV_LOG(DEBUG, "***************** PF stats end ********************");
 }
 
+static void
+i40e_dev_xstats_reset(struct rte_eth_dev *dev)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct i40e_hw_port_stats *hw_stats = &pf->stats;
+
+       /* The hw registers are cleared on read */
+       pf->offset_loaded = false;
+       i40e_read_stats_registers(pf, hw);
+
+       /* reset software counters */
+       memset(hw_stats, 0, sizeof(*hw_stats));
+}
+
+static int
+i40e_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstats *xstats,
+                   unsigned n)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       unsigned i, count = 0;
+       struct i40e_hw_port_stats *hw_stats = &pf->stats;
+
+       if (n < I40E_NB_XSTATS)
+               return I40E_NB_XSTATS;
+
+       i40e_read_stats_registers(pf, hw);
+
+       /* Reset */
+       if (xstats == NULL)
+               return 0;
+
+       /* Get stats from i40e_eth_stats struct */
+       for (i = 0; i < I40E_NB_ETH_XSTATS; i++) {
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "%s", rte_i40e_stats_strings[i].name);
+               xstats[count].value = *(uint64_t *)(((char *)&hw_stats->eth) +
+                       rte_i40e_stats_strings[i].offset);
+               count++;
+       }
+
+       /* Get individiual stats from i40e_hw_port struct */
+       for (i = 0; i < I40E_NB_HW_PORT_XSTATS; i++) {
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "%s", rte_i40e_hw_port_strings[i].name);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               rte_i40e_hw_port_strings[i].offset);
+               count++;
+       }
+
+       /* Get per-queue stats from i40e_hw_port struct */
+       for (i = 0; i < 8; i++) {
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "rx_q%u_xon_priority_packets", i);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               offsetof(struct i40e_hw_port_stats,
+                                        priority_xon_rx[i]));
+               count++;
+
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "rx_q%u_xoff_priority_packets", i);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               offsetof(struct i40e_hw_port_stats,
+                                        priority_xoff_rx[i]));
+               count++;
+
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "tx_q%u_xon_priority_packets", i);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               offsetof(struct i40e_hw_port_stats,
+                                        priority_xon_tx[i]));
+               count++;
+
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "tx_q%u_xoff_priority_packets", i);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               offsetof(struct i40e_hw_port_stats,
+                                        priority_xoff_tx[i]));
+               count++;
+
+               snprintf(xstats[count].name, sizeof(xstats[count].name),
+                        "xx_q%u_xon_to_xoff_priority_packets", i);
+               xstats[count].value = *(uint64_t *)(((char *)hw_stats) +
+                               offsetof(struct i40e_hw_port_stats,
+                                        priority_xon_2_xoff[i]));
+               count++;
+       }
+
+       return I40E_NB_XSTATS;
+}
+
 /* Reset the statistics */
 static void
 i40e_dev_stats_reset(struct rte_eth_dev *dev)
@@ -1606,6 +1974,18 @@ i40e_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                                ETH_TXQ_FLAGS_NOOFFLOADS,
        };
 
+       dev_info->rx_desc_lim = (struct rte_eth_desc_lim) {
+               .nb_max = I40E_MAX_RING_DESC,
+               .nb_min = I40E_MIN_RING_DESC,
+               .nb_align = I40E_ALIGN_RING_DESC,
+       };
+
+       dev_info->tx_desc_lim = (struct rte_eth_desc_lim) {
+               .nb_max = I40E_MAX_RING_DESC,
+               .nb_min = I40E_MIN_RING_DESC,
+               .nb_align = I40E_ALIGN_RING_DESC,
+       };
+
        if (pf->flags & I40E_FLAG_VMDQ) {
                dev_info->max_vmdq_pools = pf->max_nb_vmdq_vsi;
                dev_info->vmdq_queue_base = dev_info->max_rx_queues;
@@ -1714,12 +2094,148 @@ i40e_dev_led_off(struct rte_eth_dev *dev)
 }
 
 static int
-i40e_flow_ctrl_set(__rte_unused struct rte_eth_dev *dev,
-                  __rte_unused struct rte_eth_fc_conf *fc_conf)
+i40e_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+
+       fc_conf->pause_time = pf->fc_conf.pause_time;
+       fc_conf->high_water =  pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS];
+       fc_conf->low_water = pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS];
+
+        /* Return current mode according to actual setting*/
+       switch (hw->fc.current_mode) {
+       case I40E_FC_FULL:
+               fc_conf->mode = RTE_FC_FULL;
+               break;
+       case I40E_FC_TX_PAUSE:
+               fc_conf->mode = RTE_FC_TX_PAUSE;
+               break;
+       case I40E_FC_RX_PAUSE:
+               fc_conf->mode = RTE_FC_RX_PAUSE;
+               break;
+       case I40E_FC_NONE:
+       default:
+               fc_conf->mode = RTE_FC_NONE;
+       };
+
+       return 0;
+}
+
+static int
+i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 {
+       uint32_t mflcn_reg, fctrl_reg, reg;
+       uint32_t max_high_water;
+       uint8_t i, aq_failure;
+       int err;
+       struct i40e_hw *hw;
+       struct i40e_pf *pf;
+       enum i40e_fc_mode rte_fcmode_2_i40e_fcmode[] = {
+               [RTE_FC_NONE] = I40E_FC_NONE,
+               [RTE_FC_RX_PAUSE] = I40E_FC_RX_PAUSE,
+               [RTE_FC_TX_PAUSE] = I40E_FC_TX_PAUSE,
+               [RTE_FC_FULL] = I40E_FC_FULL
+       };
+
+       /* high_water field in the rte_eth_fc_conf using the kilobytes unit */
+
+       max_high_water = I40E_RXPBSIZE >> I40E_KILOSHIFT;
+       if ((fc_conf->high_water > max_high_water) ||
+                       (fc_conf->high_water < fc_conf->low_water)) {
+               PMD_INIT_LOG(ERR, "Invalid high/low water setup value in KB, "
+                       "High_water must <= %d.", max_high_water);
+               return -EINVAL;
+       }
+
+       hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       hw->fc.requested_mode = rte_fcmode_2_i40e_fcmode[fc_conf->mode];
+
+       pf->fc_conf.pause_time = fc_conf->pause_time;
+       pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS] = fc_conf->high_water;
+       pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS] = fc_conf->low_water;
+
        PMD_INIT_FUNC_TRACE();
 
-       return -ENOSYS;
+       /* All the link flow control related enable/disable register
+        * configuration is handle by the F/W
+        */
+       err = i40e_set_fc(hw, &aq_failure, true);
+       if (err < 0)
+               return -ENOSYS;
+
+       if (i40e_is_40G_device(hw->device_id)) {
+               /* Configure flow control refresh threshold,
+                * the value for stat_tx_pause_refresh_timer[8]
+                * is used for global pause operation.
+                */
+
+               I40E_WRITE_REG(hw,
+                              I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER(8),
+                              pf->fc_conf.pause_time);
+
+               /* configure the timer value included in transmitted pause
+                * frame,
+                * the value for stat_tx_pause_quanta[8] is used for global
+                * pause operation
+                */
+               I40E_WRITE_REG(hw, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA(8),
+                              pf->fc_conf.pause_time);
+
+               fctrl_reg = I40E_READ_REG(hw,
+                                         I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL);
+
+               if (fc_conf->mac_ctrl_frame_fwd != 0)
+                       fctrl_reg |= I40E_PRTMAC_FWD_CTRL;
+               else
+                       fctrl_reg &= ~I40E_PRTMAC_FWD_CTRL;
+
+               I40E_WRITE_REG(hw, I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL,
+                              fctrl_reg);
+       } else {
+               /* Configure pause time (2 TCs per register) */
+               reg = (uint32_t)pf->fc_conf.pause_time * (uint32_t)0x00010001;
+               for (i = 0; i < I40E_MAX_TRAFFIC_CLASS / 2; i++)
+                       I40E_WRITE_REG(hw, I40E_PRTDCB_FCTTVN(i), reg);
+
+               /* Configure flow control refresh threshold value */
+               I40E_WRITE_REG(hw, I40E_PRTDCB_FCRTV,
+                              pf->fc_conf.pause_time / 2);
+
+               mflcn_reg = I40E_READ_REG(hw, I40E_PRTDCB_MFLCN);
+
+               /* set or clear MFLCN.PMCF & MFLCN.DPF bits
+                *depending on configuration
+                */
+               if (fc_conf->mac_ctrl_frame_fwd != 0) {
+                       mflcn_reg |= I40E_PRTDCB_MFLCN_PMCF_MASK;
+                       mflcn_reg &= ~I40E_PRTDCB_MFLCN_DPF_MASK;
+               } else {
+                       mflcn_reg &= ~I40E_PRTDCB_MFLCN_PMCF_MASK;
+                       mflcn_reg |= I40E_PRTDCB_MFLCN_DPF_MASK;
+               }
+
+               I40E_WRITE_REG(hw, I40E_PRTDCB_MFLCN, mflcn_reg);
+       }
+
+       /* config the water marker both based on the packets and bytes */
+       I40E_WRITE_REG(hw, I40E_GLRPB_PHW,
+                      (pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS]
+                      << I40E_KILOSHIFT) / I40E_PACKET_AVERAGE_SIZE);
+       I40E_WRITE_REG(hw, I40E_GLRPB_PLW,
+                      (pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS]
+                      << I40E_KILOSHIFT) / I40E_PACKET_AVERAGE_SIZE);
+       I40E_WRITE_REG(hw, I40E_GLRPB_GHW,
+                      pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS]
+                      << I40E_KILOSHIFT);
+       I40E_WRITE_REG(hw, I40E_GLRPB_GLW,
+                      pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS]
+                      << I40E_KILOSHIFT);
+
+       I40E_WRITE_FLUSH(hw);
+
+       return 0;
 }
 
 static int
@@ -1925,17 +2441,73 @@ i40e_mac_filter_handle(struct rte_eth_dev *dev, enum rte_filter_op filter_op,
        return ret;
 }
 
+static int
+i40e_get_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size)
+{
+       struct i40e_pf *pf = I40E_VSI_TO_PF(vsi);
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!lut)
+               return -EINVAL;
+
+       if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
+               ret = i40e_aq_get_rss_lut(hw, vsi->vsi_id, TRUE,
+                                         lut, lut_size);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Failed to get RSS lookup table");
+                       return ret;
+               }
+       } else {
+               uint32_t *lut_dw = (uint32_t *)lut;
+               uint16_t i, lut_size_dw = lut_size / 4;
+
+               for (i = 0; i < lut_size_dw; i++)
+                       lut_dw[i] = I40E_READ_REG(hw, I40E_PFQF_HLUT(i));
+       }
+
+       return 0;
+}
+
+static int
+i40e_set_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size)
+{
+       struct i40e_pf *pf = I40E_VSI_TO_PF(vsi);
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!vsi || !lut)
+               return -EINVAL;
+
+       if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
+               ret = i40e_aq_set_rss_lut(hw, vsi->vsi_id, TRUE,
+                                         lut, lut_size);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Failed to set RSS lookup table");
+                       return ret;
+               }
+       } else {
+               uint32_t *lut_dw = (uint32_t *)lut;
+               uint16_t i, lut_size_dw = lut_size / 4;
+
+               for (i = 0; i < lut_size_dw; i++)
+                       I40E_WRITE_REG(hw, I40E_PFQF_HLUT(i), lut_dw[i]);
+               I40E_WRITE_FLUSH(hw);
+       }
+
+       return 0;
+}
+
 static int
 i40e_dev_rss_reta_update(struct rte_eth_dev *dev,
                         struct rte_eth_rss_reta_entry64 *reta_conf,
                         uint16_t reta_size)
 {
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t lut, l;
-       uint16_t i, j, lut_size = pf->hash_lut_size;
+       uint16_t i, lut_size = pf->hash_lut_size;
        uint16_t idx, shift;
-       uint8_t mask;
+       uint8_t *lut;
+       int ret;
 
        if (reta_size != lut_size ||
                reta_size > ETH_RSS_RETA_SIZE_512) {
@@ -1945,28 +2517,26 @@ i40e_dev_rss_reta_update(struct rte_eth_dev *dev,
                return -EINVAL;
        }
 
-       for (i = 0; i < reta_size; i += I40E_4_BIT_WIDTH) {
+       lut = rte_zmalloc("i40e_rss_lut", reta_size, 0);
+       if (!lut) {
+               PMD_DRV_LOG(ERR, "No memory can be allocated");
+               return -ENOMEM;
+       }
+       ret = i40e_get_rss_lut(pf->main_vsi, lut, reta_size);
+       if (ret)
+               goto out;
+       for (i = 0; i < reta_size; i++) {
                idx = i / RTE_RETA_GROUP_SIZE;
                shift = i % RTE_RETA_GROUP_SIZE;
-               mask = (uint8_t)((reta_conf[idx].mask >> shift) &
-                                               I40E_4_BIT_MASK);
-               if (!mask)
-                       continue;
-               if (mask == I40E_4_BIT_MASK)
-                       l = 0;
-               else
-                       l = I40E_READ_REG(hw, I40E_PFQF_HLUT(i >> 2));
-               for (j = 0, lut = 0; j < I40E_4_BIT_WIDTH; j++) {
-                       if (mask & (0x1 << j))
-                               lut |= reta_conf[idx].reta[shift + j] <<
-                                                       (CHAR_BIT * j);
-                       else
-                               lut |= l & (I40E_8_BIT_MASK << (CHAR_BIT * j));
-               }
-               I40E_WRITE_REG(hw, I40E_PFQF_HLUT(i >> 2), lut);
+               if (reta_conf[idx].mask & (1ULL << shift))
+                       lut[i] = reta_conf[idx].reta[shift];
        }
+       ret = i40e_set_rss_lut(pf->main_vsi, lut, reta_size);
 
-       return 0;
+out:
+       rte_free(lut);
+
+       return ret;
 }
 
 static int
@@ -1975,11 +2545,10 @@ i40e_dev_rss_reta_query(struct rte_eth_dev *dev,
                        uint16_t reta_size)
 {
        struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t lut;
-       uint16_t i, j, lut_size = pf->hash_lut_size;
+       uint16_t i, lut_size = pf->hash_lut_size;
        uint16_t idx, shift;
-       uint8_t mask;
+       uint8_t *lut;
+       int ret;
 
        if (reta_size != lut_size ||
                reta_size > ETH_RSS_RETA_SIZE_512) {
@@ -1989,23 +2558,26 @@ i40e_dev_rss_reta_query(struct rte_eth_dev *dev,
                return -EINVAL;
        }
 
-       for (i = 0; i < reta_size; i += I40E_4_BIT_WIDTH) {
-               idx = i / RTE_RETA_GROUP_SIZE;
-               shift = i % RTE_RETA_GROUP_SIZE;
-               mask = (uint8_t)((reta_conf[idx].mask >> shift) &
-                                               I40E_4_BIT_MASK);
-               if (!mask)
-                       continue;
+       lut = rte_zmalloc("i40e_rss_lut", reta_size, 0);
+       if (!lut) {
+               PMD_DRV_LOG(ERR, "No memory can be allocated");
+               return -ENOMEM;
+       }
 
-               lut = I40E_READ_REG(hw, I40E_PFQF_HLUT(i >> 2));
-               for (j = 0; j < I40E_4_BIT_WIDTH; j++) {
-                       if (mask & (0x1 << j))
-                               reta_conf[idx].reta[shift + j] = ((lut >>
-                                       (CHAR_BIT * j)) & I40E_8_BIT_MASK);
-               }
+       ret = i40e_get_rss_lut(pf->main_vsi, lut, reta_size);
+       if (ret)
+               goto out;
+       for (i = 0; i < reta_size; i++) {
+               idx = i / RTE_RETA_GROUP_SIZE;
+               shift = i % RTE_RETA_GROUP_SIZE;
+               if (reta_conf[idx].mask & (1ULL << shift))
+                       reta_conf[idx].reta[shift] = lut[i];
        }
 
-       return 0;
+out:
+       rte_free(lut);
+
+       return ret;
 }
 
 /**
@@ -2031,10 +2603,11 @@ i40e_allocate_dma_mem_d(__attribute__((unused)) struct i40e_hw *hw,
        id++;
        snprintf(z_name, sizeof(z_name), "i40e_dma_%"PRIu64, id);
 #ifdef RTE_LIBRTE_XEN_DOM0
-       mz = rte_memzone_reserve_bounded(z_name, size, 0, 0, alignment,
-                                                       RTE_PGSIZE_2M);
+       mz = rte_memzone_reserve_bounded(z_name, size, SOCKET_ID_ANY, 0,
+                                        alignment, RTE_PGSIZE_2M);
 #else
-       mz = rte_memzone_reserve_aligned(z_name, size, 0, 0, alignment);
+       mz = rte_memzone_reserve_aligned(z_name, size, SOCKET_ID_ANY, 0,
+                                        alignment);
 #endif
        if (!mz)
                return I40E_ERR_NO_MEMORY;
@@ -2178,6 +2751,10 @@ i40e_pf_parameter_init(struct rte_eth_dev *dev)
                PMD_INIT_LOG(ERR, "HW configuration doesn't support SRIOV");
                return -EINVAL;
        }
+       /* Add the parameter init for LFC */
+       pf->fc_conf.pause_time = I40E_DEFAULT_PAUSE_TIME;
+       pf->fc_conf.high_water[I40E_MAX_TRAFFIC_CLASS] = I40E_DEFAULT_HIGH_WATER;
+       pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS] = I40E_DEFAULT_LOW_WATER;
 
        pf->flags = I40E_FLAG_HEADER_SPLIT_DISABLED;
        pf->max_num_vsi = RTE_MIN(hw->func_caps.num_vsis, I40E_MAX_NUM_VSIS);
@@ -2185,6 +2762,8 @@ i40e_pf_parameter_init(struct rte_eth_dev *dev)
        /* Allocate queues for pf */
        if (hw->func_caps.rss) {
                pf->flags |= I40E_FLAG_RSS;
+               if (hw->mac.type == I40E_MAC_X722)
+                       pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE;
                pf->lan_nb_qps = RTE_MIN(hw->func_caps.num_tx_qp,
                        (uint32_t)(1 << hw->func_caps.rss_table_entry_width));
                pf->lan_nb_qps = i40e_align_floor(pf->lan_nb_qps);
@@ -2244,6 +2823,9 @@ i40e_pf_parameter_init(struct rte_eth_dev *dev)
                 */
        }
 
+       if (hw->func_caps.dcb)
+               pf->flags |= I40E_FLAG_DCB;
+
        if (sum_vsis > pf->max_num_vsi ||
                sum_queues > hw->func_caps.num_rx_qp) {
                PMD_INIT_LOG(ERR, "VSI/QUEUE setting can't be satisfied");
@@ -2649,7 +3231,7 @@ i40e_vsi_config_tc_queue_mapping(struct i40e_vsi *vsi,
                                 struct i40e_aqc_vsi_properties_data *info,
                                 uint8_t enabled_tcmap)
 {
-       int ret, total_tc = 0, i;
+       int ret, i, total_tc = 0;
        uint16_t qpnum_per_tc, bsf, qp_idx;
 
        ret = validate_tcmap_parameter(vsi, enabled_tcmap);
@@ -3638,6 +4220,9 @@ i40e_dev_tx_init(struct i40e_pf *pf)
                if (ret != I40E_SUCCESS)
                        break;
        }
+       if (ret == I40E_SUCCESS)
+               i40e_set_tx_function(container_of(pf, struct i40e_adapter, pf)
+                                    ->eth_dev);
 
        return ret;
 }
@@ -3664,6 +4249,9 @@ i40e_dev_rx_init(struct i40e_pf *pf)
                        break;
                }
        }
+       if (ret == I40E_SUCCESS)
+               i40e_set_rx_function(container_of(pf, struct i40e_adapter, pf)
+                                    ->eth_dev);
 
        return ret;
 }
@@ -4723,22 +5311,77 @@ i40e_pf_disable_rss(struct i40e_pf *pf)
 }
 
 static int
-i40e_hw_rss_hash_set(struct i40e_hw *hw, struct rte_eth_rss_conf *rss_conf)
+i40e_set_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t key_len)
 {
-       uint32_t *hash_key;
-       uint8_t hash_key_len;
-       uint64_t rss_hf;
-       uint16_t i;
-       uint64_t hena;
+       struct i40e_pf *pf = I40E_VSI_TO_PF(vsi);
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int ret = 0;
+
+       if (!key || key_len != ((I40E_PFQF_HKEY_MAX_INDEX + 1) *
+               sizeof(uint32_t)))
+               return -EINVAL;
+
+       if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
+               struct i40e_aqc_get_set_rss_key_data *key_dw =
+                       (struct i40e_aqc_get_set_rss_key_data *)key;
+
+               ret = i40e_aq_set_rss_key(hw, vsi->vsi_id, key_dw);
+               if (ret)
+                       PMD_INIT_LOG(ERR, "Failed to configure RSS key "
+                                    "via AQ");
+       } else {
+               uint32_t *hash_key = (uint32_t *)key;
+               uint16_t i;
 
-       hash_key = (uint32_t *)(rss_conf->rss_key);
-       hash_key_len = rss_conf->rss_key_len;
-       if (hash_key != NULL && hash_key_len >=
-               (I40E_PFQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t)) {
-               /* Fill in RSS hash key */
                for (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)
                        I40E_WRITE_REG(hw, I40E_PFQF_HKEY(i), hash_key[i]);
+               I40E_WRITE_FLUSH(hw);
+       }
+
+       return ret;
+}
+
+static int
+i40e_get_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t *key_len)
+{
+       struct i40e_pf *pf = I40E_VSI_TO_PF(vsi);
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int ret;
+
+       if (!key || !key_len)
+               return -EINVAL;
+
+       if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
+               ret = i40e_aq_get_rss_key(hw, vsi->vsi_id,
+                       (struct i40e_aqc_get_set_rss_key_data *)key);
+               if (ret) {
+                       PMD_INIT_LOG(ERR, "Failed to get RSS key via AQ");
+                       return ret;
+               }
+       } else {
+               uint32_t *key_dw = (uint32_t *)key;
+               uint16_t i;
+
+               for (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)
+                       key_dw[i] = I40E_READ_REG(hw, I40E_PFQF_HKEY(i));
        }
+       *key_len = (I40E_PFQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
+
+       return 0;
+}
+
+static int
+i40e_hw_rss_hash_set(struct i40e_pf *pf, struct rte_eth_rss_conf *rss_conf)
+{
+       struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+       uint64_t rss_hf;
+       uint64_t hena;
+       int ret;
+
+       ret = i40e_set_rss_key(pf->main_vsi, rss_conf->rss_key,
+                              rss_conf->rss_key_len);
+       if (ret)
+               return ret;
 
        rss_hf = rss_conf->rss_hf;
        hena = (uint64_t)I40E_READ_REG(hw, I40E_PFQF_HENA(0));
@@ -4756,6 +5399,7 @@ static int
 i40e_dev_rss_hash_update(struct rte_eth_dev *dev,
                         struct rte_eth_rss_conf *rss_conf)
 {
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint64_t rss_hf = rss_conf->rss_hf & I40E_RSS_OFFLOAD_ALL;
        uint64_t hena;
@@ -4771,23 +5415,20 @@ i40e_dev_rss_hash_update(struct rte_eth_dev *dev,
        if (rss_hf == 0) /* Disable RSS */
                return -EINVAL;
 
-       return i40e_hw_rss_hash_set(hw, rss_conf);
+       return i40e_hw_rss_hash_set(pf, rss_conf);
 }
 
 static int
 i40e_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
                           struct rte_eth_rss_conf *rss_conf)
 {
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t *hash_key = (uint32_t *)(rss_conf->rss_key);
        uint64_t hena;
-       uint16_t i;
 
-       if (hash_key != NULL) {
-               for (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)
-                       hash_key[i] = I40E_READ_REG(hw, I40E_PFQF_HKEY(i));
-               rss_conf->rss_key_len = i * sizeof(uint32_t);
-       }
+       i40e_get_rss_key(pf->main_vsi, rss_conf->rss_key,
+                        &rss_conf->rss_key_len);
+
        hena = (uint64_t)I40E_READ_REG(hw, I40E_PFQF_HENA(0));
        hena |= ((uint64_t)I40E_READ_REG(hw, I40E_PFQF_HENA(1))) << 32;
        rss_conf->rss_hf = i40e_parse_hena(hena);
@@ -5125,7 +5766,7 @@ i40e_pf_config_rss(struct i40e_pf *pf)
                                                        sizeof(uint32_t);
        }
 
-       return i40e_hw_rss_hash_set(hw, &rss_conf);
+       return i40e_hw_rss_hash_set(pf, &rss_conf);
 }
 
 static int
@@ -5200,11 +5841,6 @@ i40e_pf_config_mq_rx(struct i40e_pf *pf)
        int ret = 0;
        enum rte_eth_rx_mq_mode mq_mode = pf->dev_data->dev_conf.rxmode.mq_mode;
 
-       if (mq_mode & ETH_MQ_RX_DCB_FLAG) {
-               PMD_INIT_LOG(ERR, "i40e doesn't support DCB yet");
-               return -ENOTSUP;
-       }
-
        /* RSS setup */
        if (mq_mode & ETH_MQ_RX_RSS_FLAG)
                ret = i40e_pf_config_rss(pf);
@@ -6229,3 +6865,524 @@ i40e_timesync_read_tx_timestamp(struct rte_eth_dev *dev,
 
        return  0;
 }
+
+/*
+ * i40e_parse_dcb_configure - parse dcb configure from user
+ * @dev: the device being configured
+ * @dcb_cfg: pointer of the result of parse
+ * @*tc_map: bit map of enabled traffic classes
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static int
+i40e_parse_dcb_configure(struct rte_eth_dev *dev,
+                        struct i40e_dcbx_config *dcb_cfg,
+                        uint8_t *tc_map)
+{
+       struct rte_eth_dcb_rx_conf *dcb_rx_conf;
+       uint8_t i, tc_bw, bw_lf;
+
+       memset(dcb_cfg, 0, sizeof(struct i40e_dcbx_config));
+
+       dcb_rx_conf = &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf;
+       if (dcb_rx_conf->nb_tcs > I40E_MAX_TRAFFIC_CLASS) {
+               PMD_INIT_LOG(ERR, "number of tc exceeds max.");
+               return -EINVAL;
+       }
+
+       /* assume each tc has the same bw */
+       tc_bw = I40E_MAX_PERCENT / dcb_rx_conf->nb_tcs;
+       for (i = 0; i < dcb_rx_conf->nb_tcs; i++)
+               dcb_cfg->etscfg.tcbwtable[i] = tc_bw;
+       /* to ensure the sum of tcbw is equal to 100 */
+       bw_lf = I40E_MAX_PERCENT % dcb_rx_conf->nb_tcs;
+       for (i = 0; i < bw_lf; i++)
+               dcb_cfg->etscfg.tcbwtable[i]++;
+
+       /* assume each tc has the same Transmission Selection Algorithm */
+       for (i = 0; i < dcb_rx_conf->nb_tcs; i++)
+               dcb_cfg->etscfg.tsatable[i] = I40E_IEEE_TSA_ETS;
+
+       for (i = 0; i < I40E_MAX_USER_PRIORITY; i++)
+               dcb_cfg->etscfg.prioritytable[i] =
+                               dcb_rx_conf->dcb_tc[i];
+
+       /* FW needs one App to configure HW */
+       dcb_cfg->numapps = I40E_DEFAULT_DCB_APP_NUM;
+       dcb_cfg->app[0].selector = I40E_APP_SEL_ETHTYPE;
+       dcb_cfg->app[0].priority = I40E_DEFAULT_DCB_APP_PRIO;
+       dcb_cfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;
+
+       if (dcb_rx_conf->nb_tcs == 0)
+               *tc_map = 1; /* tc0 only */
+       else
+               *tc_map = RTE_LEN2MASK(dcb_rx_conf->nb_tcs, uint8_t);
+
+       if (dev->data->dev_conf.dcb_capability_en & ETH_DCB_PFC_SUPPORT) {
+               dcb_cfg->pfc.willing = 0;
+               dcb_cfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;
+               dcb_cfg->pfc.pfcenable = *tc_map;
+       }
+       return 0;
+}
+
+/*
+ * i40e_vsi_get_bw_info - Query VSI BW Information
+ * @vsi: the VSI being queried
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static int
+i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
+{
+       struct i40e_aqc_query_vsi_ets_sla_config_resp bw_ets_config = {0};
+       struct i40e_aqc_query_vsi_bw_config_resp bw_config = {0};
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int i, ret;
+       uint32_t tc_bw_max;
+
+       /* Get the VSI level BW configuration */
+       ret = i40e_aq_query_vsi_bw_config(hw, vsi->seid, &bw_config, NULL);
+       if (ret) {
+               PMD_INIT_LOG(ERR,
+                        "couldn't get PF vsi bw config, err %s aq_err %s\n",
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
+               return -EINVAL;
+       }
+
+       /* Get the VSI level BW configuration per TC */
+       ret = i40e_aq_query_vsi_ets_sla_config(hw, vsi->seid, &bw_ets_config,
+                                                 NULL);
+       if (ret) {
+               PMD_INIT_LOG(ERR,
+                        "couldn't get PF vsi ets bw config, err %s aq_err %s\n",
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
+               return -EINVAL;
+       }
+
+       if (bw_config.tc_valid_bits != bw_ets_config.tc_valid_bits) {
+               PMD_INIT_LOG(WARNING,
+                        "Enabled TCs mismatch from querying VSI BW info"
+                        " 0x%08x 0x%08x\n", bw_config.tc_valid_bits,
+                        bw_ets_config.tc_valid_bits);
+               /* Still continuing */
+       }
+
+       vsi->bw_info.bw_limit = rte_le_to_cpu_16(bw_config.port_bw_limit);
+       vsi->bw_info.bw_max_quanta = bw_config.max_bw;
+       tc_bw_max = rte_le_to_cpu_16(bw_ets_config.tc_bw_max[0]) |
+                   (rte_le_to_cpu_16(bw_ets_config.tc_bw_max[1]) << 16);
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               vsi->bw_info.bw_ets_share_credits[i] =
+                               bw_ets_config.share_credits[i];
+               vsi->bw_info.bw_ets_limit_credits[i] =
+                               rte_le_to_cpu_16(bw_ets_config.credits[i]);
+               /* 3 bits out of 4 for each TC */
+               vsi->bw_info.bw_ets_max_quanta[i] =
+                       (uint8_t)((tc_bw_max >> (i * 4)) & 0x7);
+               PMD_INIT_LOG(DEBUG,
+                        "%s: vsi seid = %d, TC = %d, qset = 0x%x\n",
+                        __func__, vsi->seid, i, bw_config.qs_handles[i]);
+       }
+
+       return 0;
+}
+
+static int
+i40e_vsi_update_queue_mapping(struct i40e_vsi *vsi,
+                             struct i40e_aqc_vsi_properties_data *info,
+                             uint8_t enabled_tcmap)
+{
+       int ret, i, total_tc = 0;
+       uint16_t qpnum_per_tc, bsf, qp_idx;
+       struct rte_eth_dev_data *dev_data = I40E_VSI_TO_DEV_DATA(vsi);
+
+       ret = validate_tcmap_parameter(vsi, enabled_tcmap);
+       if (ret != I40E_SUCCESS)
+               return ret;
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (enabled_tcmap & (1 << i))
+                       total_tc++;
+       }
+       if (total_tc == 0)
+               total_tc = 1;
+       vsi->enabled_tc = enabled_tcmap;
+
+       qpnum_per_tc = dev_data->nb_rx_queues / total_tc;
+       /* Number of queues per enabled TC */
+       if (qpnum_per_tc == 0) {
+               PMD_INIT_LOG(ERR, " number of queues is less that tcs.");
+               return I40E_ERR_INVALID_QP_ID;
+       }
+       qpnum_per_tc = RTE_MIN(i40e_align_floor(qpnum_per_tc),
+                               I40E_MAX_Q_PER_TC);
+       bsf = rte_bsf32(qpnum_per_tc);
+
+       /**
+        * Configure TC and queue mapping parameters, for enabled TC,
+        * allocate qpnum_per_tc queues to this traffic. For disabled TC,
+        * default queue will serve it.
+        */
+       qp_idx = 0;
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (vsi->enabled_tc & (1 << i)) {
+                       info->tc_mapping[i] = rte_cpu_to_le_16((qp_idx <<
+                                       I40E_AQ_VSI_TC_QUE_OFFSET_SHIFT) |
+                               (bsf << I40E_AQ_VSI_TC_QUE_NUMBER_SHIFT));
+                       qp_idx += qpnum_per_tc;
+               } else
+                       info->tc_mapping[i] = 0;
+       }
+
+       /* Associate queue number with VSI, Keep vsi->nb_qps unchanged */
+       if (vsi->type == I40E_VSI_SRIOV) {
+               info->mapping_flags |=
+                       rte_cpu_to_le_16(I40E_AQ_VSI_QUE_MAP_NONCONTIG);
+               for (i = 0; i < vsi->nb_qps; i++)
+                       info->queue_mapping[i] =
+                               rte_cpu_to_le_16(vsi->base_queue + i);
+       } else {
+               info->mapping_flags |=
+                       rte_cpu_to_le_16(I40E_AQ_VSI_QUE_MAP_CONTIG);
+               info->queue_mapping[0] = rte_cpu_to_le_16(vsi->base_queue);
+       }
+       info->valid_sections |=
+               rte_cpu_to_le_16(I40E_AQ_VSI_PROP_QUEUE_MAP_VALID);
+
+       return I40E_SUCCESS;
+}
+
+/*
+ * i40e_vsi_config_tc - Configure VSI tc setting for given TC map
+ * @vsi: VSI to be configured
+ * @tc_map: enabled TC bitmap
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static int
+i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map)
+{
+       struct i40e_aqc_configure_vsi_tc_bw_data bw_data;
+       struct i40e_vsi_context ctxt;
+       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       int ret = 0;
+       int i;
+
+       /* Check if enabled_tc is same as existing or new TCs */
+       if (vsi->enabled_tc == tc_map)
+               return ret;
+
+       /* configure tc bandwidth */
+       memset(&bw_data, 0, sizeof(bw_data));
+       bw_data.tc_valid_bits = tc_map;
+       /* Enable ETS TCs with equal BW Share for now across all VSIs */
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (tc_map & BIT_ULL(i))
+                       bw_data.tc_bw_credits[i] = 1;
+       }
+       ret = i40e_aq_config_vsi_tc_bw(hw, vsi->seid, &bw_data, NULL);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "AQ command Config VSI BW allocation"
+                       " per TC failed = %d",
+                       hw->aq.asq_last_status);
+               goto out;
+       }
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)
+               vsi->info.qs_handle[i] = bw_data.qs_handles[i];
+
+       /* Update Queue Pairs Mapping for currently enabled UPs */
+       ctxt.seid = vsi->seid;
+       ctxt.pf_num = hw->pf_id;
+       ctxt.vf_num = 0;
+       ctxt.uplink_seid = vsi->uplink_seid;
+       ctxt.info = vsi->info;
+       i40e_get_cap(hw);
+       ret = i40e_vsi_update_queue_mapping(vsi, &ctxt.info, tc_map);
+       if (ret)
+               goto out;
+
+       /* Update the VSI after updating the VSI queue-mapping information */
+       ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "Failed to configure "
+                           "TC queue mapping = %d",
+                           hw->aq.asq_last_status);
+               goto out;
+       }
+       /* update the local VSI info with updated queue map */
+       (void)rte_memcpy(&vsi->info.tc_mapping, &ctxt.info.tc_mapping,
+                                       sizeof(vsi->info.tc_mapping));
+       (void)rte_memcpy(&vsi->info.queue_mapping,
+                       &ctxt.info.queue_mapping,
+               sizeof(vsi->info.queue_mapping));
+       vsi->info.mapping_flags = ctxt.info.mapping_flags;
+       vsi->info.valid_sections = 0;
+
+       /* Update current VSI BW information */
+       ret = i40e_vsi_get_bw_info(vsi);
+       if (ret) {
+               PMD_INIT_LOG(ERR,
+                        "Failed updating vsi bw info, err %s aq_err %s",
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
+               goto out;
+       }
+
+       vsi->enabled_tc = tc_map;
+
+out:
+       return ret;
+}
+
+/*
+ * i40e_dcb_hw_configure - program the dcb setting to hw
+ * @pf: pf the configuration is taken on
+ * @new_cfg: new configuration
+ * @tc_map: enabled TC bitmap
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static enum i40e_status_code
+i40e_dcb_hw_configure(struct i40e_pf *pf,
+                     struct i40e_dcbx_config *new_cfg,
+                     uint8_t tc_map)
+{
+       struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+       struct i40e_dcbx_config *old_cfg = &hw->local_dcbx_config;
+       struct i40e_vsi *main_vsi = pf->main_vsi;
+       struct i40e_vsi_list *vsi_list;
+       int i, ret;
+       uint32_t val;
+
+       /* Use the FW API if FW > v4.4*/
+       if (!((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver >= 4))) {
+               PMD_INIT_LOG(ERR, "FW < v4.4, can not use FW LLDP API"
+                                 " to configure DCB");
+               return I40E_ERR_FIRMWARE_API_VERSION;
+       }
+
+       /* Check if need reconfiguration */
+       if (!memcmp(new_cfg, old_cfg, sizeof(struct i40e_dcbx_config))) {
+               PMD_INIT_LOG(ERR, "No Change in DCB Config required.");
+               return I40E_SUCCESS;
+       }
+
+       /* Copy the new config to the current config */
+       *old_cfg = *new_cfg;
+       old_cfg->etsrec = old_cfg->etscfg;
+       ret = i40e_set_dcb_config(hw);
+       if (ret) {
+               PMD_INIT_LOG(ERR,
+                        "Set DCB Config failed, err %s aq_err %s\n",
+                        i40e_stat_str(hw, ret),
+                        i40e_aq_str(hw, hw->aq.asq_last_status));
+               return ret;
+       }
+       /* set receive Arbiter to RR mode and ETS scheme by default */
+       for (i = 0; i <= I40E_PRTDCB_RETSTCC_MAX_INDEX; i++) {
+               val = I40E_READ_REG(hw, I40E_PRTDCB_RETSTCC(i));
+               val &= ~(I40E_PRTDCB_RETSTCC_BWSHARE_MASK     |
+                        I40E_PRTDCB_RETSTCC_UPINTC_MODE_MASK |
+                        I40E_PRTDCB_RETSTCC_ETSTC_SHIFT);
+               val |= ((uint32_t)old_cfg->etscfg.tcbwtable[i] <<
+                       I40E_PRTDCB_RETSTCC_BWSHARE_SHIFT) &
+                        I40E_PRTDCB_RETSTCC_BWSHARE_MASK;
+               val |= ((uint32_t)1 << I40E_PRTDCB_RETSTCC_UPINTC_MODE_SHIFT) &
+                        I40E_PRTDCB_RETSTCC_UPINTC_MODE_MASK;
+               val |= ((uint32_t)1 << I40E_PRTDCB_RETSTCC_ETSTC_SHIFT) &
+                        I40E_PRTDCB_RETSTCC_ETSTC_MASK;
+               I40E_WRITE_REG(hw, I40E_PRTDCB_RETSTCC(i), val);
+       }
+       /* get local mib to check whether it is configured correctly */
+       /* IEEE mode */
+       hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE;
+       /* Get Local DCB Config */
+       i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,
+                                    &hw->local_dcbx_config);
+
+       /* Update each VSI */
+       i40e_vsi_config_tc(main_vsi, tc_map);
+       if (main_vsi->veb) {
+               TAILQ_FOREACH(vsi_list, &main_vsi->veb->head, list) {
+                       /* Beside main VSI, only enable default
+                        * TC for other VSIs
+                        */
+                       ret = i40e_vsi_config_tc(vsi_list->vsi,
+                                               I40E_DEFAULT_TCMAP);
+                       if (ret)
+                               PMD_INIT_LOG(WARNING,
+                                        "Failed configuring TC for VSI seid=%d\n",
+                                        vsi_list->vsi->seid);
+                       /* continue */
+               }
+       }
+       return I40E_SUCCESS;
+}
+
+/*
+ * i40e_dcb_init_configure - initial dcb config
+ * @dev: device being configured
+ * @sw_dcb: indicate whether dcb is sw configured or hw offload
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static int
+i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int ret = 0;
+
+       if ((pf->flags & I40E_FLAG_DCB) == 0) {
+               PMD_INIT_LOG(ERR, "HW doesn't support DCB");
+               return -ENOTSUP;
+       }
+
+       /* DCB initialization:
+        * Update DCB configuration from the Firmware and configure
+        * LLDP MIB change event.
+        */
+       if (sw_dcb == TRUE) {
+               ret = i40e_aq_stop_lldp(hw, TRUE, NULL);
+               if (ret != I40E_SUCCESS)
+                       PMD_INIT_LOG(DEBUG, "Failed to stop lldp");
+
+               ret = i40e_init_dcb(hw);
+               /* if sw_dcb, lldp agent is stopped, the return from
+                * i40e_init_dcb we expect is failure with I40E_AQ_RC_EPERM
+                * adminq status.
+                */
+               if (ret != I40E_SUCCESS &&
+                   hw->aq.asq_last_status == I40E_AQ_RC_EPERM) {
+                       memset(&hw->local_dcbx_config, 0,
+                               sizeof(struct i40e_dcbx_config));
+                       /* set dcb default configuration */
+                       hw->local_dcbx_config.etscfg.willing = 0;
+                       hw->local_dcbx_config.etscfg.maxtcs = 0;
+                       hw->local_dcbx_config.etscfg.tcbwtable[0] = 100;
+                       hw->local_dcbx_config.etscfg.tsatable[0] =
+                                               I40E_IEEE_TSA_ETS;
+                       hw->local_dcbx_config.etsrec =
+                               hw->local_dcbx_config.etscfg;
+                       hw->local_dcbx_config.pfc.willing = 0;
+                       hw->local_dcbx_config.pfc.pfccap =
+                                               I40E_MAX_TRAFFIC_CLASS;
+                       /* FW needs one App to configure HW */
+                       hw->local_dcbx_config.numapps = 1;
+                       hw->local_dcbx_config.app[0].selector =
+                                               I40E_APP_SEL_ETHTYPE;
+                       hw->local_dcbx_config.app[0].priority = 3;
+                       hw->local_dcbx_config.app[0].protocolid =
+                                               I40E_APP_PROTOID_FCOE;
+                       ret = i40e_set_dcb_config(hw);
+                       if (ret) {
+                               PMD_INIT_LOG(ERR, "default dcb config fails."
+                                       " err = %d, aq_err = %d.", ret,
+                                         hw->aq.asq_last_status);
+                               return -ENOSYS;
+                       }
+               } else {
+                       PMD_INIT_LOG(ERR, "DCBX configuration failed, err = %d,"
+                                         " aq_err = %d.", ret,
+                                         hw->aq.asq_last_status);
+                       return -ENOTSUP;
+               }
+       } else {
+               ret = i40e_aq_start_lldp(hw, NULL);
+               if (ret != I40E_SUCCESS)
+                       PMD_INIT_LOG(DEBUG, "Failed to start lldp");
+
+               ret = i40e_init_dcb(hw);
+               if (!ret) {
+                       if (hw->dcbx_status == I40E_DCBX_STATUS_DISABLED) {
+                               PMD_INIT_LOG(ERR, "HW doesn't support"
+                                                 " DCBX offload.");
+                               return -ENOTSUP;
+                       }
+               } else {
+                       PMD_INIT_LOG(ERR, "DCBX configuration failed, err = %d,"
+                                         " aq_err = %d.", ret,
+                                         hw->aq.asq_last_status);
+                       return -ENOTSUP;
+               }
+       }
+       return 0;
+}
+
+/*
+ * i40e_dcb_setup - setup dcb related config
+ * @dev: device being configured
+ *
+ * Returns 0 on success, negative value on failure
+ */
+static int
+i40e_dcb_setup(struct rte_eth_dev *dev)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_dcbx_config dcb_cfg;
+       uint8_t tc_map = 0;
+       int ret = 0;
+
+       if ((pf->flags & I40E_FLAG_DCB) == 0) {
+               PMD_INIT_LOG(ERR, "HW doesn't support DCB");
+               return -ENOTSUP;
+       }
+
+       if (pf->vf_num != 0 ||
+           (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_VMDQ_FLAG))
+               PMD_INIT_LOG(DEBUG, " DCB only works on main vsi.");
+
+       ret = i40e_parse_dcb_configure(dev, &dcb_cfg, &tc_map);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "invalid dcb config");
+               return -EINVAL;
+       }
+       ret = i40e_dcb_hw_configure(pf, &dcb_cfg, tc_map);
+       if (ret) {
+               PMD_INIT_LOG(ERR, "dcb sw configure fails");
+               return -ENOSYS;
+       }
+       return 0;
+}
+
+static int
+i40e_dev_get_dcb_info(struct rte_eth_dev *dev,
+                     struct rte_eth_dcb_info *dcb_info)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct i40e_vsi *vsi = pf->main_vsi;
+       struct i40e_dcbx_config *dcb_cfg = &hw->local_dcbx_config;
+       uint16_t bsf, tc_mapping;
+       int i;
+
+       if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_DCB_FLAG)
+               dcb_info->nb_tcs = rte_bsf32(vsi->enabled_tc + 1);
+       else
+               dcb_info->nb_tcs = 1;
+       for (i = 0; i < I40E_MAX_USER_PRIORITY; i++)
+               dcb_info->prio_tc[i] = dcb_cfg->etscfg.prioritytable[i];
+       for (i = 0; i < dcb_info->nb_tcs; i++)
+               dcb_info->tc_bws[i] = dcb_cfg->etscfg.tcbwtable[i];
+
+       for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {
+               if (vsi->enabled_tc & (1 << i)) {
+                       tc_mapping = rte_le_to_cpu_16(vsi->info.tc_mapping[i]);
+                       /* only main vsi support multi TCs */
+                       dcb_info->tc_queue.tc_rxq[0][i].base =
+                               (tc_mapping & I40E_AQ_VSI_TC_QUE_OFFSET_MASK) >>
+                               I40E_AQ_VSI_TC_QUE_OFFSET_SHIFT;
+                       dcb_info->tc_queue.tc_txq[0][i].base =
+                               dcb_info->tc_queue.tc_rxq[0][i].base;
+                       bsf = (tc_mapping & I40E_AQ_VSI_TC_QUE_NUMBER_MASK) >>
+                               I40E_AQ_VSI_TC_QUE_NUMBER_SHIFT;
+                       dcb_info->tc_queue.tc_rxq[0][i].nb_queue = 1 << bsf;
+                       dcb_info->tc_queue.tc_txq[0][i].nb_queue =
+                               dcb_info->tc_queue.tc_rxq[0][i].nb_queue;
+               }
+       }
+       return 0;
+}