net/i40e/base: use new virtchnl header file
[dpdk.git] / drivers / net / i40e / i40e_ethdev_vf.c
index effb7a7..ab5e985 100644 (file)
@@ -55,6 +55,7 @@
 #include <rte_alarm.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
+#include <rte_ethdev_pci.h>
 #include <rte_atomic.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
@@ -76,7 +77,7 @@
 #define MAX_RESET_WAIT_CNT     20
 
 struct i40evf_arq_msg_info {
-       enum i40e_virtchnl_ops ops;
+       enum virtchnl_ops ops;
        enum i40e_status_code result;
        uint16_t buf_len;
        uint16_t msg_len;
@@ -84,7 +85,7 @@ struct i40evf_arq_msg_info {
 };
 
 struct vf_cmd_info {
-       enum i40e_virtchnl_ops ops;
+       enum virtchnl_ops ops;
        uint8_t *in_args;
        uint32_t in_args_size;
        uint8_t *out_buffer;
@@ -107,7 +108,7 @@ static void i40evf_dev_stop(struct rte_eth_dev *dev);
 static void i40evf_dev_info_get(struct rte_eth_dev *dev,
                                struct rte_eth_dev_info *dev_info);
 static int i40evf_dev_link_update(struct rte_eth_dev *dev,
-                                 __rte_unused int wait_to_complete);
+                                 int wait_to_complete);
 static void i40evf_dev_stats_get(struct rte_eth_dev *dev,
                                struct rte_eth_stats *stats);
 static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
@@ -135,10 +136,10 @@ static int i40evf_dev_tx_queue_start(struct rte_eth_dev *dev,
                                     uint16_t tx_queue_id);
 static int i40evf_dev_tx_queue_stop(struct rte_eth_dev *dev,
                                    uint16_t tx_queue_id);
-static void i40evf_add_mac_addr(struct rte_eth_dev *dev,
-                               struct ether_addr *addr,
-                               uint32_t index,
-                               uint32_t pool);
+static int i40evf_add_mac_addr(struct rte_eth_dev *dev,
+                              struct ether_addr *addr,
+                              uint32_t index,
+                              uint32_t pool);
 static void i40evf_del_mac_addr(struct rte_eth_dev *dev, uint32_t index);
 static int i40evf_dev_rss_reta_update(struct rte_eth_dev *dev,
                        struct rte_eth_rss_reta_entry64 *reta_conf,
@@ -151,11 +152,14 @@ static int i40evf_dev_rss_hash_update(struct rte_eth_dev *dev,
                                      struct rte_eth_rss_conf *rss_conf);
 static int i40evf_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
                                        struct rte_eth_rss_conf *rss_conf);
+static int i40evf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
+static void i40evf_set_default_mac_addr(struct rte_eth_dev *dev,
+                                       struct ether_addr *mac_addr);
 static int
 i40evf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id);
 static int
 i40evf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id);
-static void i40evf_handle_pf_event(__rte_unused struct rte_eth_dev *dev,
+static void i40evf_handle_pf_event(struct rte_eth_dev *dev,
                                   uint8_t *msg,
                                   uint16_t msglen);
 
@@ -214,6 +218,8 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = {
        .rx_queue_intr_enable = i40evf_dev_rx_queue_intr_enable,
        .rx_queue_intr_disable = i40evf_dev_rx_queue_intr_disable,
        .rx_descriptor_done   = i40e_dev_rx_descriptor_done,
+       .rx_descriptor_status = i40e_dev_rx_descriptor_status,
+       .tx_descriptor_status = i40e_dev_tx_descriptor_status,
        .tx_queue_setup       = i40e_dev_tx_queue_setup,
        .tx_queue_release     = i40e_dev_tx_queue_release,
        .rx_queue_count       = i40e_dev_rx_queue_count,
@@ -225,6 +231,8 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = {
        .reta_query           = i40evf_dev_rss_reta_query,
        .rss_hash_update      = i40evf_dev_rss_hash_update,
        .rss_hash_conf_get    = i40evf_dev_rss_hash_conf_get,
+       .mtu_set              = i40evf_dev_mtu_set,
+       .mac_addr_set         = i40evf_set_default_mac_addr,
 };
 
 /*
@@ -236,7 +244,7 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data)
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_arq_event_info event;
-       enum i40e_virtchnl_ops opcode;
+       enum virtchnl_ops opcode;
        enum i40e_status_code retval;
        int ret;
        enum i40evf_aq_result result = I40EVF_MSG_NON;
@@ -251,16 +259,16 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data)
                return result;
        }
 
-       opcode = (enum i40e_virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
+       opcode = (enum virtchnl_ops)rte_le_to_cpu_32(event.desc.cookie_high);
        retval = (enum i40e_status_code)rte_le_to_cpu_32(event.desc.cookie_low);
        /* pf sys event */
-       if (opcode == I40E_VIRTCHNL_OP_EVENT) {
-               struct i40e_virtchnl_pf_event *vpe =
-                       (struct i40e_virtchnl_pf_event *)event.msg_buf;
+       if (opcode == VIRTCHNL_OP_EVENT) {
+               struct virtchnl_pf_event *vpe =
+                       (struct virtchnl_pf_event *)event.msg_buf;
 
                result = I40EVF_MSG_SYS;
                switch (vpe->event) {
-               case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
+               case VIRTCHNL_EVENT_LINK_CHANGE:
                        vf->link_up =
                                vpe->event_data.link_event.link_status;
                        vf->link_speed =
@@ -269,12 +277,12 @@ i40evf_read_pfmsg(struct rte_eth_dev *dev, struct i40evf_arq_msg_info *data)
                        PMD_DRV_LOG(INFO, "Link status update:%s",
                                    vf->link_up ? "up" : "down");
                        break;
-               case I40E_VIRTCHNL_EVENT_RESET_IMPENDING:
+               case VIRTCHNL_EVENT_RESET_IMPENDING:
                        vf->vf_reset = true;
                        vf->pend_msg |= PFMSG_RESET_IMPENDING;
                        PMD_DRV_LOG(INFO, "vf is reseting");
                        break;
-               case I40E_VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
+               case VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
                        vf->dev_closed = true;
                        vf->pend_msg |= PFMSG_DRIVER_CLOSE;
                        PMD_DRV_LOG(INFO, "PF driver closed");
@@ -304,17 +312,17 @@ static inline void
 _clear_cmd(struct i40e_vf *vf)
 {
        rte_wmb();
-       vf->pend_cmd = I40E_VIRTCHNL_OP_UNKNOWN;
+       vf->pend_cmd = VIRTCHNL_OP_UNKNOWN;
 }
 
 /*
  * Check there is pending cmd in execution. If none, set new command.
  */
 static inline int
-_atomic_set_cmd(struct i40e_vf *vf, enum i40e_virtchnl_ops ops)
+_atomic_set_cmd(struct i40e_vf *vf, enum virtchnl_ops ops)
 {
        int ret = rte_atomic32_cmpset(&vf->pend_cmd,
-                       I40E_VIRTCHNL_OP_UNKNOWN, ops);
+                       VIRTCHNL_OP_UNKNOWN, ops);
 
        if (!ret)
                PMD_DRV_LOG(ERR, "There is incomplete cmd %d", vf->pend_cmd);
@@ -339,7 +347,7 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
 
        info.msg = args->out_buffer;
        info.buf_len = args->out_size;
-       info.ops = I40E_VIRTCHNL_OP_UNKNOWN;
+       info.ops = VIRTCHNL_OP_UNKNOWN;
        info.result = I40E_SUCCESS;
 
        err = i40e_aq_send_msg_to_pf(hw, args->ops, I40E_SUCCESS,
@@ -351,16 +359,17 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
        }
 
        switch (args->ops) {
-       case I40E_VIRTCHNL_OP_RESET_VF:
+       case VIRTCHNL_OP_RESET_VF:
                /*no need to process in this function */
                err = 0;
                break;
-       case I40E_VIRTCHNL_OP_VERSION:
-       case I40E_VIRTCHNL_OP_GET_VF_RESOURCES:
+       case VIRTCHNL_OP_VERSION:
+       case VIRTCHNL_OP_GET_VF_RESOURCES:
                /* for init adminq commands, need to poll the response */
                err = -1;
                do {
                        ret = i40evf_read_pfmsg(dev, &info);
+                       vf->cmd_retval = info.result;
                        if (ret == I40EVF_MSG_CMD) {
                                err = 0;
                                break;
@@ -376,7 +385,7 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
                /* for other adminq in running time, waiting the cmd done flag */
                err = -1;
                do {
-                       if (vf->pend_cmd == I40E_VIRTCHNL_OP_UNKNOWN) {
+                       if (vf->pend_cmd == VIRTCHNL_OP_UNKNOWN) {
                                err = 0;
                                break;
                        }
@@ -395,15 +404,15 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
 static int
 i40evf_check_api_version(struct rte_eth_dev *dev)
 {
-       struct i40e_virtchnl_version_info version, *pver;
+       struct virtchnl_version_info version, *pver;
        int err;
        struct vf_cmd_info args;
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
-       version.major = I40E_VIRTCHNL_VERSION_MAJOR;
-       version.minor = I40E_VIRTCHNL_VERSION_MINOR;
+       version.major = VIRTCHNL_VERSION_MAJOR;
+       version.minor = VIRTCHNL_VERSION_MINOR;
 
-       args.ops = I40E_VIRTCHNL_OP_VERSION;
+       args.ops = VIRTCHNL_OP_VERSION;
        args.in_args = (uint8_t *)&version;
        args.in_args_size = sizeof(version);
        args.out_buffer = vf->aq_resp;
@@ -415,19 +424,19 @@ i40evf_check_api_version(struct rte_eth_dev *dev)
                return err;
        }
 
-       pver = (struct i40e_virtchnl_version_info *)args.out_buffer;
+       pver = (struct virtchnl_version_info *)args.out_buffer;
        vf->version_major = pver->major;
        vf->version_minor = pver->minor;
        if (vf->version_major == I40E_DPDK_VERSION_MAJOR)
                PMD_DRV_LOG(INFO, "Peer is DPDK PF host");
-       else if ((vf->version_major == I40E_VIRTCHNL_VERSION_MAJOR) &&
-               (vf->version_minor <= I40E_VIRTCHNL_VERSION_MINOR))
+       else if ((vf->version_major == VIRTCHNL_VERSION_MAJOR) &&
+               (vf->version_minor <= VIRTCHNL_VERSION_MINOR))
                PMD_DRV_LOG(INFO, "Peer is Linux PF host");
        else {
                PMD_INIT_LOG(ERR, "PF/VF API version mismatch:(%u.%u)-(%u.%u)",
                                        vf->version_major, vf->version_minor,
-                                               I40E_VIRTCHNL_VERSION_MAJOR,
-                                               I40E_VIRTCHNL_VERSION_MINOR);
+                                               VIRTCHNL_VERSION_MAJOR,
+                                               VIRTCHNL_VERSION_MINOR);
                return -1;
        }
 
@@ -443,15 +452,15 @@ i40evf_get_vf_resource(struct rte_eth_dev *dev)
        struct vf_cmd_info args;
        uint32_t caps, len;
 
-       args.ops = I40E_VIRTCHNL_OP_GET_VF_RESOURCES;
+       args.ops = VIRTCHNL_OP_GET_VF_RESOURCES;
        args.out_buffer = vf->aq_resp;
        args.out_size = I40E_AQ_BUF_SZ;
        if (PF_IS_V11(vf)) {
-               caps = I40E_VIRTCHNL_VF_OFFLOAD_L2 |
-                      I40E_VIRTCHNL_VF_OFFLOAD_RSS_AQ |
-                      I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG |
-                      I40E_VIRTCHNL_VF_OFFLOAD_VLAN |
-                      I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING;
+               caps = VIRTCHNL_VF_OFFLOAD_L2 |
+                      VIRTCHNL_VF_OFFLOAD_RSS_AQ |
+                      VIRTCHNL_VF_OFFLOAD_RSS_REG |
+                      VIRTCHNL_VF_OFFLOAD_VLAN |
+                      VIRTCHNL_VF_OFFLOAD_RX_POLLING;
                args.in_args = (uint8_t *)&caps;
                args.in_args_size = sizeof(caps);
        } else {
@@ -465,8 +474,8 @@ i40evf_get_vf_resource(struct rte_eth_dev *dev)
                return err;
        }
 
-       len =  sizeof(struct i40e_virtchnl_vf_resource) +
-               I40E_MAX_VF_VSI * sizeof(struct i40e_virtchnl_vsi_resource);
+       len =  sizeof(struct virtchnl_vf_resource) +
+               I40E_MAX_VF_VSI * sizeof(struct virtchnl_vsi_resource);
 
        (void)rte_memcpy(vf->vf_res, args.out_buffer,
                        RTE_MIN(args.out_size, len));
@@ -483,18 +492,18 @@ i40evf_config_promisc(struct rte_eth_dev *dev,
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        int err;
        struct vf_cmd_info args;
-       struct i40e_virtchnl_promisc_info promisc;
+       struct virtchnl_promisc_info promisc;
 
        promisc.flags = 0;
        promisc.vsi_id = vf->vsi_res->vsi_id;
 
        if (enable_unicast)
-               promisc.flags |= I40E_FLAG_VF_UNICAST_PROMISC;
+               promisc.flags |= FLAG_VF_UNICAST_PROMISC;
 
        if (enable_multicast)
-               promisc.flags |= I40E_FLAG_VF_MULTICAST_PROMISC;
+               promisc.flags |= FLAG_VF_MULTICAST_PROMISC;
 
-       args.ops = I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE;
+       args.ops = VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE;
        args.in_args = (uint8_t *)&promisc;
        args.in_args_size = sizeof(promisc);
        args.out_buffer = vf->aq_resp;
@@ -516,12 +525,12 @@ i40evf_config_vlan_offload(struct rte_eth_dev *dev,
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        int err;
        struct vf_cmd_info args;
-       struct i40e_virtchnl_vlan_offload_info offload;
+       struct virtchnl_vlan_offload_info offload;
 
        offload.vsi_id = vf->vsi_res->vsi_id;
        offload.enable_vlan_strip = enable_vlan_strip;
 
-       args.ops = (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD;
+       args.ops = (enum virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD;
        args.in_args = (uint8_t *)&offload;
        args.in_args_size = sizeof(offload);
        args.out_buffer = vf->aq_resp;
@@ -541,7 +550,7 @@ i40evf_config_vlan_pvid(struct rte_eth_dev *dev,
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        int err;
        struct vf_cmd_info args;
-       struct i40e_virtchnl_pvid_info tpid_info;
+       struct virtchnl_pvid_info tpid_info;
 
        if (info == NULL) {
                PMD_DRV_LOG(ERR, "invalid parameters");
@@ -552,7 +561,7 @@ i40evf_config_vlan_pvid(struct rte_eth_dev *dev,
        tpid_info.vsi_id = vf->vsi_res->vsi_id;
        (void)rte_memcpy(&tpid_info.info, info, sizeof(*info));
 
-       args.ops = (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_PVID;
+       args.ops = (enum virtchnl_ops)I40E_VIRTCHNL_OP_CFG_VLAN_PVID;
        args.in_args = (uint8_t *)&tpid_info;
        args.in_args_size = sizeof(tpid_info);
        args.out_buffer = vf->aq_resp;
@@ -566,7 +575,7 @@ i40evf_config_vlan_pvid(struct rte_eth_dev *dev,
 }
 
 static void
-i40evf_fill_virtchnl_vsi_txq_info(struct i40e_virtchnl_txq_info *txq_info,
+i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
                                  uint16_t vsi_id,
                                  uint16_t queue_id,
                                  uint16_t nb_txq,
@@ -581,7 +590,7 @@ i40evf_fill_virtchnl_vsi_txq_info(struct i40e_virtchnl_txq_info *txq_info,
 }
 
 static void
-i40evf_fill_virtchnl_vsi_rxq_info(struct i40e_virtchnl_rxq_info *rxq_info,
+i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
                                  uint16_t vsi_id,
                                  uint16_t queue_id,
                                  uint16_t nb_rxq,
@@ -609,8 +618,8 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
                (struct i40e_rx_queue **)dev->data->rx_queues;
        struct i40e_tx_queue **txq =
                (struct i40e_tx_queue **)dev->data->tx_queues;
-       struct i40e_virtchnl_vsi_queue_config_info *vc_vqci;
-       struct i40e_virtchnl_queue_pair_info *vc_qpi;
+       struct virtchnl_vsi_queue_config_info *vc_vqci;
+       struct virtchnl_queue_pair_info *vc_qpi;
        struct vf_cmd_info args;
        uint16_t i, nb_qp = vf->num_queue_pairs;
        const uint32_t size =
@@ -619,7 +628,7 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
        int ret;
 
        memset(buff, 0, sizeof(buff));
-       vc_vqci = (struct i40e_virtchnl_vsi_queue_config_info *)buff;
+       vc_vqci = (struct virtchnl_vsi_queue_config_info *)buff;
        vc_vqci->vsi_id = vf->vsi_res->vsi_id;
        vc_vqci->num_queue_pairs = nb_qp;
 
@@ -631,7 +640,7 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
                                        vf->max_pkt_len, rxq[i]);
        }
        memset(&args, 0, sizeof(args));
-       args.ops = I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES;
+       args.ops = VIRTCHNL_OP_CONFIG_VSI_QUEUES;
        args.in_args = (uint8_t *)vc_vqci;
        args.in_args_size = size;
        args.out_buffer = vf->aq_resp;
@@ -639,7 +648,7 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
        ret = i40evf_execute_vf_cmd(dev, &args);
        if (ret)
                PMD_DRV_LOG(ERR, "Failed to execute command of "
-                       "I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES\n");
+                       "VIRTCHNL_OP_CONFIG_VSI_QUEUES");
 
        return ret;
 }
@@ -653,8 +662,8 @@ i40evf_configure_vsi_queues_ext(struct rte_eth_dev *dev)
                (struct i40e_rx_queue **)dev->data->rx_queues;
        struct i40e_tx_queue **txq =
                (struct i40e_tx_queue **)dev->data->tx_queues;
-       struct i40e_virtchnl_vsi_queue_config_ext_info *vc_vqcei;
-       struct i40e_virtchnl_queue_pair_ext_info *vc_qpei;
+       struct virtchnl_vsi_queue_config_ext_info *vc_vqcei;
+       struct virtchnl_queue_pair_ext_info *vc_qpei;
        struct vf_cmd_info args;
        uint16_t i, nb_qp = vf->num_queue_pairs;
        const uint32_t size =
@@ -663,7 +672,7 @@ i40evf_configure_vsi_queues_ext(struct rte_eth_dev *dev)
        int ret;
 
        memset(buff, 0, sizeof(buff));
-       vc_vqcei = (struct i40e_virtchnl_vsi_queue_config_ext_info *)buff;
+       vc_vqcei = (struct virtchnl_vsi_queue_config_ext_info *)buff;
        vc_vqcei->vsi_id = vf->vsi_res->vsi_id;
        vc_vqcei->num_queue_pairs = nb_qp;
        vc_qpei = vc_vqcei->qpair;
@@ -684,7 +693,7 @@ i40evf_configure_vsi_queues_ext(struct rte_eth_dev *dev)
        }
        memset(&args, 0, sizeof(args));
        args.ops =
-               (enum i40e_virtchnl_ops)I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT;
+               (enum virtchnl_ops)VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT;
        args.in_args = (uint8_t *)vc_vqcei;
        args.in_args_size = size;
        args.out_buffer = vf->aq_resp;
@@ -692,7 +701,7 @@ i40evf_configure_vsi_queues_ext(struct rte_eth_dev *dev)
        ret = i40evf_execute_vf_cmd(dev, &args);
        if (ret)
                PMD_DRV_LOG(ERR, "Failed to execute command of "
-                       "I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT\n");
+                       "VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT");
 
        return ret;
 }
@@ -715,10 +724,10 @@ i40evf_config_irq_map(struct rte_eth_dev *dev)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct vf_cmd_info args;
-       uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_irq_map_info) + \
-               sizeof(struct i40e_virtchnl_vector_map)];
-       struct i40e_virtchnl_irq_map_info *map_info;
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       uint8_t cmd_buffer[sizeof(struct virtchnl_irq_map_info) + \
+               sizeof(struct virtchnl_vector_map)];
+       struct virtchnl_irq_map_info *map_info;
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        uint32_t vector_id;
        int i, err;
@@ -732,7 +741,7 @@ i40evf_config_irq_map(struct rte_eth_dev *dev)
                vector_id = I40E_MISC_VEC_ID;
        }
 
-       map_info = (struct i40e_virtchnl_irq_map_info *)cmd_buffer;
+       map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
        map_info->num_vectors = 1;
        map_info->vecmap[0].rxitr_idx = I40E_ITR_INDEX_DEFAULT;
        map_info->vecmap[0].vsi_id = vf->vsi_res->vsi_id;
@@ -747,7 +756,7 @@ i40evf_config_irq_map(struct rte_eth_dev *dev)
                        intr_handle->intr_vec[i] = vector_id;
        }
 
-       args.ops = I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP;
+       args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
        args.in_args = (u8 *)cmd_buffer;
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
@@ -764,7 +773,7 @@ i40evf_switch_queue(struct rte_eth_dev *dev, bool isrx, uint16_t qid,
                                bool on)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct i40e_virtchnl_queue_select queue_select;
+       struct virtchnl_queue_select queue_select;
        int err;
        struct vf_cmd_info args;
        memset(&queue_select, 0, sizeof(queue_select));
@@ -776,9 +785,9 @@ i40evf_switch_queue(struct rte_eth_dev *dev, bool isrx, uint16_t qid,
                queue_select.tx_queues |= 1 << qid;
 
        if (on)
-               args.ops = I40E_VIRTCHNL_OP_ENABLE_QUEUES;
+               args.ops = VIRTCHNL_OP_ENABLE_QUEUES;
        else
-               args.ops = I40E_VIRTCHNL_OP_DISABLE_QUEUES;
+               args.ops = VIRTCHNL_OP_DISABLE_QUEUES;
        args.in_args = (u8 *)&queue_select;
        args.in_args_size = sizeof(queue_select);
        args.out_buffer = vf->aq_resp;
@@ -846,16 +855,16 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 i40evf_add_mac_addr(struct rte_eth_dev *dev,
                    struct ether_addr *addr,
                    __rte_unused uint32_t index,
                    __rte_unused uint32_t pool)
 {
-       struct i40e_virtchnl_ether_addr_list *list;
+       struct virtchnl_ether_addr_list *list;
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_ether_addr_list) + \
-                       sizeof(struct i40e_virtchnl_ether_addr)];
+       uint8_t cmd_buffer[sizeof(struct virtchnl_ether_addr_list) + \
+                       sizeof(struct virtchnl_ether_addr)];
        int err;
        struct vf_cmd_info args;
 
@@ -864,16 +873,16 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev,
                            addr->addr_bytes[0], addr->addr_bytes[1],
                            addr->addr_bytes[2], addr->addr_bytes[3],
                            addr->addr_bytes[4], addr->addr_bytes[5]);
-               return;
+               return I40E_ERR_INVALID_MAC_ADDR;
        }
 
-       list = (struct i40e_virtchnl_ether_addr_list *)cmd_buffer;
+       list = (struct virtchnl_ether_addr_list *)cmd_buffer;
        list->vsi_id = vf->vsi_res->vsi_id;
        list->num_elements = 1;
        (void)rte_memcpy(list->list[0].addr, addr->addr_bytes,
                                        sizeof(addr->addr_bytes));
 
-       args.ops = I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS;
+       args.ops = VIRTCHNL_OP_ADD_ETH_ADDR;
        args.in_args = cmd_buffer;
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
@@ -883,23 +892,20 @@ i40evf_add_mac_addr(struct rte_eth_dev *dev,
                PMD_DRV_LOG(ERR, "fail to execute command "
                            "OP_ADD_ETHER_ADDRESS");
 
-       return;
+       return err;
 }
 
 static void
-i40evf_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
+i40evf_del_mac_addr_by_addr(struct rte_eth_dev *dev,
+                           struct ether_addr *addr)
 {
-       struct i40e_virtchnl_ether_addr_list *list;
+       struct virtchnl_ether_addr_list *list;
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct rte_eth_dev_data *data = dev->data;
-       struct ether_addr *addr;
-       uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_ether_addr_list) + \
-                       sizeof(struct i40e_virtchnl_ether_addr)];
+       uint8_t cmd_buffer[sizeof(struct virtchnl_ether_addr_list) + \
+                       sizeof(struct virtchnl_ether_addr)];
        int err;
        struct vf_cmd_info args;
 
-       addr = &(data->mac_addrs[index]);
-
        if (i40e_validate_mac_addr(addr->addr_bytes) != I40E_SUCCESS) {
                PMD_DRV_LOG(ERR, "Invalid mac:%x-%x-%x-%x-%x-%x",
                            addr->addr_bytes[0], addr->addr_bytes[1],
@@ -908,13 +914,13 @@ i40evf_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
                return;
        }
 
-       list = (struct i40e_virtchnl_ether_addr_list *)cmd_buffer;
+       list = (struct virtchnl_ether_addr_list *)cmd_buffer;
        list->vsi_id = vf->vsi_res->vsi_id;
        list->num_elements = 1;
        (void)rte_memcpy(list->list[0].addr, addr->addr_bytes,
                        sizeof(addr->addr_bytes));
 
-       args.ops = I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS;
+       args.ops = VIRTCHNL_OP_DEL_ETH_ADDR;
        args.in_args = cmd_buffer;
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
@@ -926,17 +932,28 @@ i40evf_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
        return;
 }
 
+static void
+i40evf_del_mac_addr(struct rte_eth_dev *dev, uint32_t index)
+{
+       struct rte_eth_dev_data *data = dev->data;
+       struct ether_addr *addr;
+
+       addr = &data->mac_addrs[index];
+
+       i40evf_del_mac_addr_by_addr(dev, addr);
+}
+
 static int
 i40evf_update_stats(struct rte_eth_dev *dev, struct i40e_eth_stats **pstats)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct i40e_virtchnl_queue_select q_stats;
+       struct virtchnl_queue_select q_stats;
        int err;
        struct vf_cmd_info args;
 
        memset(&q_stats, 0, sizeof(q_stats));
        q_stats.vsi_id = vf->vsi_res->vsi_id;
-       args.ops = I40E_VIRTCHNL_OP_GET_STATS;
+       args.ops = VIRTCHNL_OP_GET_STATS;
        args.in_args = (u8 *)&q_stats;
        args.in_args_size = sizeof(q_stats);
        args.out_buffer = vf->aq_resp;
@@ -966,7 +983,7 @@ i40evf_get_statistics(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                                                pstats->rx_broadcast;
        stats->opackets = pstats->tx_broadcast + pstats->tx_multicast +
                                                pstats->tx_unicast;
-       stats->ierrors = pstats->rx_discards;
+       stats->imissed = pstats->rx_discards;
        stats->oerrors = pstats->tx_errors + pstats->tx_discards;
        stats->ibytes = pstats->rx_bytes;
        stats->obytes = pstats->tx_bytes;
@@ -1033,18 +1050,18 @@ static int
 i40evf_add_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct i40e_virtchnl_vlan_filter_list *vlan_list;
-       uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_vlan_filter_list) +
+       struct virtchnl_vlan_filter_list *vlan_list;
+       uint8_t cmd_buffer[sizeof(struct virtchnl_vlan_filter_list) +
                                                        sizeof(uint16_t)];
        int err;
        struct vf_cmd_info args;
 
-       vlan_list = (struct i40e_virtchnl_vlan_filter_list *)cmd_buffer;
+       vlan_list = (struct virtchnl_vlan_filter_list *)cmd_buffer;
        vlan_list->vsi_id = vf->vsi_res->vsi_id;
        vlan_list->num_elements = 1;
        vlan_list->vlan_id[0] = vlanid;
 
-       args.ops = I40E_VIRTCHNL_OP_ADD_VLAN;
+       args.ops = VIRTCHNL_OP_ADD_VLAN;
        args.in_args = (u8 *)&cmd_buffer;
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
@@ -1060,18 +1077,18 @@ static int
 i40evf_del_vlan(struct rte_eth_dev *dev, uint16_t vlanid)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct i40e_virtchnl_vlan_filter_list *vlan_list;
-       uint8_t cmd_buffer[sizeof(struct i40e_virtchnl_vlan_filter_list) +
+       struct virtchnl_vlan_filter_list *vlan_list;
+       uint8_t cmd_buffer[sizeof(struct virtchnl_vlan_filter_list) +
                                                        sizeof(uint16_t)];
        int err;
        struct vf_cmd_info args;
 
-       vlan_list = (struct i40e_virtchnl_vlan_filter_list *)cmd_buffer;
+       vlan_list = (struct virtchnl_vlan_filter_list *)cmd_buffer;
        vlan_list->vsi_id = vf->vsi_res->vsi_id;
        vlan_list->num_elements = 1;
        vlan_list->vlan_id[0] = vlanid;
 
-       args.ops = I40E_VIRTCHNL_OP_DEL_VLAN;
+       args.ops = VIRTCHNL_OP_DEL_VLAN;
        args.in_args = (u8 *)&cmd_buffer;
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
@@ -1161,7 +1178,7 @@ i40evf_reset_vf(struct i40e_hw *hw)
                reset = rd32(hw, I40E_VFGEN_RSTAT) &
                        I40E_VFGEN_RSTAT_VFR_STATE_MASK;
                reset = reset >> I40E_VFGEN_RSTAT_VFR_STATE_SHIFT;
-               if (I40E_VFR_COMPLETED == reset || I40E_VFR_VFACTIVE == reset)
+               if (VIRTCHNL_VFR_COMPLETED == reset || VIRTCHNL_VFR_VFACTIVE == reset)
                        break;
                else
                        rte_delay_ms(50);
@@ -1181,7 +1198,6 @@ i40evf_init_vf(struct rte_eth_dev *dev)
        int i, err, bufsz;
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-       struct ether_addr *p_mac_addr;
        uint16_t interval =
                i40e_calc_itr_interval(I40E_QUEUE_ITR_INTERVAL_MAX);
 
@@ -1226,8 +1242,8 @@ i40evf_init_vf(struct rte_eth_dev *dev)
                PMD_INIT_LOG(ERR, "check_api version failed");
                goto err_aq;
        }
-       bufsz = sizeof(struct i40e_virtchnl_vf_resource) +
-               (I40E_MAX_VF_VSI * sizeof(struct i40e_virtchnl_vsi_resource));
+       bufsz = sizeof(struct virtchnl_vf_resource) +
+               (I40E_MAX_VF_VSI * sizeof(struct virtchnl_vsi_resource));
        vf->vf_res = rte_zmalloc("vf_res", bufsz, 0);
        if (!vf->vf_res) {
                PMD_INIT_LOG(ERR, "unable to allocate vf_res memory");
@@ -1241,7 +1257,7 @@ i40evf_init_vf(struct rte_eth_dev *dev)
 
        /* got VF config message back from PF, now we can parse it */
        for (i = 0; i < vf->vf_res->num_vsis; i++) {
-               if (vf->vf_res->vsi_res[i].vsi_type == I40E_VSI_SRIOV)
+               if (vf->vf_res->vsi_res[i].vsi_type == VIRTCHNL_VSI_SRIOV)
                        vf->vsi_res = &vf->vf_res->vsi_res[i];
        }
 
@@ -1253,14 +1269,13 @@ i40evf_init_vf(struct rte_eth_dev *dev)
        if (hw->mac.type == I40E_MAC_X722_VF)
                vf->flags = I40E_FLAG_RSS_AQ_CAPABLE;
        vf->vsi.vsi_id = vf->vsi_res->vsi_id;
-       vf->vsi.type = vf->vsi_res->vsi_type;
+       vf->vsi.type = (enum i40e_vsi_type)vf->vsi_res->vsi_type;
        vf->vsi.nb_qps = vf->vsi_res->num_queue_pairs;
        vf->vsi.adapter = I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
 
        /* Store the MAC address configured by host, or generate random one */
-       p_mac_addr = (struct ether_addr *)(vf->vsi_res->default_mac_addr);
-       if (is_valid_assigned_ether_addr(p_mac_addr)) /* Configured by host */
-               ether_addr_copy(p_mac_addr, (struct ether_addr *)hw->mac.addr);
+       if (is_valid_assigned_ether_addr((struct ether_addr *)hw->mac.addr))
+               vf->flags |= I40E_FLAG_VF_MAC_BY_PF;
        else
                eth_random_addr(hw->mac.addr); /* Generate a random one */
 
@@ -1303,26 +1318,26 @@ i40evf_uninit_vf(struct rte_eth_dev *dev)
 }
 
 static void
-i40evf_handle_pf_event(__rte_unused struct rte_eth_dev *dev,
-                          uint8_t *msg,
-                          __rte_unused uint16_t msglen)
+i40evf_handle_pf_event(struct rte_eth_dev *dev, uint8_t *msg,
+               __rte_unused uint16_t msglen)
 {
-       struct i40e_virtchnl_pf_event *pf_msg =
-                       (struct i40e_virtchnl_pf_event *)msg;
+       struct virtchnl_pf_event *pf_msg =
+                       (struct virtchnl_pf_event *)msg;
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
        switch (pf_msg->event) {
-       case I40E_VIRTCHNL_EVENT_RESET_IMPENDING:
-               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event\n");
-               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET, NULL);
+       case VIRTCHNL_EVENT_RESET_IMPENDING:
+               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
+               _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_RESET,
+                                             NULL, NULL);
                break;
-       case I40E_VIRTCHNL_EVENT_LINK_CHANGE:
-               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event\n");
+       case VIRTCHNL_EVENT_LINK_CHANGE:
+               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
                vf->link_up = pf_msg->event_data.link_event.link_status;
                vf->link_speed = pf_msg->event_data.link_event.link_speed;
                break;
-       case I40E_VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
-               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event\n");
+       case VIRTCHNL_EVENT_PF_DRIVER_CLOSE:
+               PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event");
                break;
        default:
                PMD_DRV_LOG(ERR, " unknown event received %u", pf_msg->event);
@@ -1337,7 +1352,7 @@ i40evf_handle_aq_msg(struct rte_eth_dev *dev)
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_arq_event_info info;
        uint16_t pending, aq_opc;
-       enum i40e_virtchnl_ops msg_opc;
+       enum virtchnl_ops msg_opc;
        enum i40e_status_code msg_ret;
        int ret;
 
@@ -1362,13 +1377,13 @@ i40evf_handle_aq_msg(struct rte_eth_dev *dev)
                 * cookie_high of struct i40e_aq_desc, while return error code
                 * are stored in cookie_low, Which is done by
                 * i40e_aq_send_msg_to_vf in PF driver.*/
-               msg_opc = (enum i40e_virtchnl_ops)rte_le_to_cpu_32(
+               msg_opc = (enum virtchnl_ops)rte_le_to_cpu_32(
                                                  info.desc.cookie_high);
                msg_ret = (enum i40e_status_code)rte_le_to_cpu_32(
                                                  info.desc.cookie_low);
                switch (aq_opc) {
                case i40e_aqc_opc_send_msg_to_vf:
-                       if (msg_opc == I40E_VIRTCHNL_OP_EVENT)
+                       if (msg_opc == VIRTCHNL_OP_EVENT)
                                /* process event*/
                                i40evf_handle_pf_event(dev, info.msg_buf,
                                                       info.msg_len);
@@ -1384,7 +1399,7 @@ i40evf_handle_aq_msg(struct rte_eth_dev *dev)
                                                "expect %u, get %u",
                                                vf->pend_cmd, msg_opc);
                                PMD_DRV_LOG(DEBUG, "adminq response is received,"
-                                            " opcode = %d\n", msg_opc);
+                                            " opcode = %d", msg_opc);
                        }
                        break;
                default:
@@ -1408,8 +1423,7 @@ i40evf_handle_aq_msg(struct rte_eth_dev *dev)
  *  void
  */
 static void
-i40evf_dev_interrupt_handler(struct rte_intr_handle *intr_handle,
-                            void *param)
+i40evf_dev_interrupt_handler(void *param)
 {
        struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -1422,23 +1436,23 @@ i40evf_dev_interrupt_handler(struct rte_intr_handle *intr_handle,
 
        /* No interrupt event indicated */
        if (!(icr0 & I40E_VFINT_ICR01_INTEVENT_MASK)) {
-               PMD_DRV_LOG(DEBUG, "No interrupt event, nothing to do\n");
+               PMD_DRV_LOG(DEBUG, "No interrupt event, nothing to do");
                goto done;
        }
 
        if (icr0 & I40E_VFINT_ICR01_ADMINQ_MASK) {
-               PMD_DRV_LOG(DEBUG, "ICR01_ADMINQ is reported\n");
+               PMD_DRV_LOG(DEBUG, "ICR01_ADMINQ is reported");
                i40evf_handle_aq_msg(dev);
        }
 
        /* Link Status Change interrupt */
        if (icr0 & I40E_VFINT_ICR01_LINK_STAT_CHANGE_MASK)
                PMD_DRV_LOG(DEBUG, "LINK_STAT_CHANGE is reported,"
-                                  " do nothing\n");
+                                  " do nothing");
 
 done:
        i40evf_enable_irq0(hw);
-       rte_intr_enable(intr_handle);
+       rte_intr_enable(dev->intr_handle);
 }
 
 static int
@@ -1446,7 +1460,7 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
 {
        struct i40e_hw *hw
                = I40E_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(eth_dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1464,9 +1478,9 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
                i40e_set_tx_function(eth_dev);
                return 0;
        }
-
+       i40e_set_default_ptype_table(eth_dev);
        rte_eth_copy_pci_info(eth_dev, pci_dev);
-       eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_DETACHABLE;
 
        hw->vendor_id = pci_dev->id.vendor_id;
        hw->device_id = pci_dev->id.device_id;
@@ -1530,24 +1544,32 @@ i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
 
        return 0;
 }
+
+static int eth_i40evf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+       struct rte_pci_device *pci_dev)
+{
+       return rte_eth_dev_pci_generic_probe(pci_dev,
+               sizeof(struct i40e_adapter), i40evf_dev_init);
+}
+
+static int eth_i40evf_pci_remove(struct rte_pci_device *pci_dev)
+{
+       return rte_eth_dev_pci_generic_remove(pci_dev, i40evf_dev_uninit);
+}
+
 /*
  * virtual function driver struct
  */
-static struct eth_driver rte_i40evf_pmd = {
-       .pci_drv = {
-               .id_table = pci_id_i40evf_map,
-               .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
-               .probe = rte_eth_dev_pci_probe,
-               .remove = rte_eth_dev_pci_remove,
-       },
-       .eth_dev_init = i40evf_dev_init,
-       .eth_dev_uninit = i40evf_dev_uninit,
-       .dev_private_size = sizeof(struct i40e_adapter),
+static struct rte_pci_driver rte_i40evf_pmd = {
+       .id_table = pci_id_i40evf_map,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+       .probe = eth_i40evf_pci_probe,
+       .remove = eth_i40evf_pci_remove,
 };
 
-RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv);
+RTE_PMD_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
-RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio");
+RTE_PMD_REGISTER_KMOD_DEP(net_i40e_vf, "* igb_uio | vfio-pci");
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
@@ -1570,8 +1592,8 @@ i40evf_dev_configure(struct rte_eth_dev *dev)
         */
        if (!conf->rxmode.hw_strip_crc) {
                vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-               if ((vf->version_major == I40E_VIRTCHNL_VERSION_MAJOR) &&
-                   (vf->version_minor <= I40E_VIRTCHNL_VERSION_MINOR)) {
+               if ((vf->version_major == VIRTCHNL_VERSION_MAJOR) &&
+                   (vf->version_minor <= VIRTCHNL_VERSION_MINOR)) {
                        /* Peer is running non-DPDK PF driver. */
                        PMD_INIT_LOG(ERR, "VF can't disable HW CRC Strip");
                        return -EINVAL;
@@ -1862,7 +1884,7 @@ i40evf_enable_queues_intr(struct rte_eth_dev *dev)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
        if (!rte_intr_allow_others(intr_handle)) {
@@ -1895,7 +1917,7 @@ i40evf_disable_queues_intr(struct rte_eth_dev *dev)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
        if (!rte_intr_allow_others(intr_handle)) {
@@ -1922,7 +1944,7 @@ i40evf_disable_queues_intr(struct rte_eth_dev *dev)
 static int
 i40evf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 {
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint16_t interval =
@@ -1957,7 +1979,7 @@ i40evf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 static int
 i40evf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
 {
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint16_t msix_intr;
@@ -1979,7 +2001,7 @@ i40evf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
 static void
 i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
 {
-       struct i40e_virtchnl_ether_addr_list *list;
+       struct virtchnl_ether_addr_list *list;
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        int err, i, j;
        int next_begin = 0;
@@ -1990,11 +2012,11 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
 
        do {
                j = 0;
-               len = sizeof(struct i40e_virtchnl_ether_addr_list);
+               len = sizeof(struct virtchnl_ether_addr_list);
                for (i = begin; i < I40E_NUM_MACADDR_MAX; i++, next_begin++) {
                        if (is_zero_ether_addr(&dev->data->mac_addrs[i]))
                                continue;
-                       len += sizeof(struct i40e_virtchnl_ether_addr);
+                       len += sizeof(struct virtchnl_ether_addr);
                        if (len >= I40E_AQ_BUF_SZ) {
                                next_begin = i + 1;
                                break;
@@ -2002,6 +2024,10 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
                }
 
                list = rte_zmalloc("i40evf_del_mac_buffer", len, 0);
+               if (!list) {
+                       PMD_DRV_LOG(ERR, "fail to allocate memory");
+                       return;
+               }
 
                for (i = begin; i < next_begin; i++) {
                        addr = &dev->data->mac_addrs[i];
@@ -2017,8 +2043,8 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)
                }
                list->vsi_id = vf->vsi_res->vsi_id;
                list->num_elements = j;
-               args.ops = add ? I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS :
-                          I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS;
+               args.ops = add ? VIRTCHNL_OP_ADD_ETH_ADDR :
+                          VIRTCHNL_OP_DEL_ETH_ADDR;
                args.in_args = (uint8_t *)list;
                args.in_args_size = len;
                args.out_buffer = vf->aq_resp;
@@ -2038,7 +2064,7 @@ i40evf_dev_start(struct rte_eth_dev *dev)
 {
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        uint32_t intr_vector = 0;
 
@@ -2063,7 +2089,7 @@ i40evf_dev_start(struct rte_eth_dev *dev)
                                    dev->data->nb_rx_queues * sizeof(int), 0);
                if (!intr_handle->intr_vec) {
                        PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues"
-                                    " intr_vec\n", dev->data->nb_rx_queues);
+                                    " intr_vec", dev->data->nb_rx_queues);
                        return -ENOMEM;
                }
        }
@@ -2104,7 +2130,7 @@ err_queue:
 static void
 i40evf_dev_stop(struct rte_eth_dev *dev)
 {
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
        PMD_INIT_FUNC_TRACE();
@@ -2149,6 +2175,9 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
        case I40E_LINK_SPEED_20GB:
                new_link.link_speed = ETH_SPEED_NUM_20G;
                break;
+       case I40E_LINK_SPEED_25GB:
+               new_link.link_speed = ETH_SPEED_NUM_25G;
+               break;
        case I40E_LINK_SPEED_40GB:
                new_link.link_speed = ETH_SPEED_NUM_40G;
                break;
@@ -2232,7 +2261,7 @@ i40evf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
        memset(dev_info, 0, sizeof(*dev_info));
-       dev_info->pci_dev = RTE_DEV_TO_PCI(dev->device);
+       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        dev_info->max_rx_queues = vf->vsi_res->num_queue_pairs;
        dev_info->max_tx_queues = vf->vsi_res->num_queue_pairs;
        dev_info->min_rx_bufsize = I40E_BUF_SIZE_MIN;
@@ -2301,7 +2330,7 @@ static void
 i40evf_dev_close(struct rte_eth_dev *dev)
 {
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       struct rte_pci_device *pci_dev = I40E_DEV_TO_PCI(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
 
        i40evf_dev_stop(dev);
@@ -2391,7 +2420,7 @@ i40evf_dev_rss_reta_update(struct rte_eth_dev *dev,
        if (reta_size != ETH_RSS_RETA_SIZE_64) {
                PMD_DRV_LOG(ERR, "The size of hash lookup table configured "
                        "(%d) doesn't match the number of hardware can "
-                       "support (%d)\n", reta_size, ETH_RSS_RETA_SIZE_64);
+                       "support (%d)", reta_size, ETH_RSS_RETA_SIZE_64);
                return -EINVAL;
        }
 
@@ -2430,7 +2459,7 @@ i40evf_dev_rss_reta_query(struct rte_eth_dev *dev,
        if (reta_size != ETH_RSS_RETA_SIZE_64) {
                PMD_DRV_LOG(ERR, "The size of hash lookup table configured "
                        "(%d) doesn't match the number of hardware can "
-                       "support (%d)\n", reta_size, ETH_RSS_RETA_SIZE_64);
+                       "support (%d)", reta_size, ETH_RSS_RETA_SIZE_64);
                return -EINVAL;
        }
 
@@ -2575,7 +2604,7 @@ i40evf_config_rss(struct i40e_vf *vf)
 
        if (vf->dev_data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) {
                i40evf_disable_rss(vf);
-               PMD_DRV_LOG(DEBUG, "RSS not configured\n");
+               PMD_DRV_LOG(DEBUG, "RSS not configured");
                return 0;
        }
 
@@ -2592,7 +2621,7 @@ i40evf_config_rss(struct i40e_vf *vf)
        rss_conf = vf->dev_data->dev_conf.rx_adv_conf.rss_conf;
        if ((rss_conf.rss_hf & I40E_RSS_OFFLOAD_ALL) == 0) {
                i40evf_disable_rss(vf);
-               PMD_DRV_LOG(DEBUG, "No hash flag is set\n");
+               PMD_DRV_LOG(DEBUG, "No hash flag is set");
                return 0;
        }
 
@@ -2652,3 +2681,54 @@ i40evf_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 
        return 0;
 }
+
+static int
+i40evf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+       struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+       struct rte_eth_dev_data *dev_data = vf->dev_data;
+       uint32_t frame_size = mtu + I40E_ETH_OVERHEAD;
+       int ret = 0;
+
+       /* check if mtu is within the allowed range */
+       if ((mtu < ETHER_MIN_MTU) || (frame_size > I40E_FRAME_SIZE_MAX))
+               return -EINVAL;
+
+       /* mtu setting is forbidden if port is start */
+       if (dev_data->dev_started) {
+               PMD_DRV_LOG(ERR, "port %d must be stopped before configuration",
+                           dev_data->port_id);
+               return -EBUSY;
+       }
+
+       if (frame_size > ETHER_MAX_LEN)
+               dev_data->dev_conf.rxmode.jumbo_frame = 1;
+       else
+               dev_data->dev_conf.rxmode.jumbo_frame = 0;
+
+       dev_data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
+
+       return ret;
+}
+
+static void
+i40evf_set_default_mac_addr(struct rte_eth_dev *dev,
+                           struct ether_addr *mac_addr)
+{
+       struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+
+       if (!is_valid_assigned_ether_addr(mac_addr)) {
+               PMD_DRV_LOG(ERR, "Tried to set invalid MAC address.");
+               return;
+       }
+
+       if (is_same_ether_addr(mac_addr, dev->data->mac_addrs))
+               return;
+
+       if (vf->flags & I40E_FLAG_VF_MAC_BY_PF)
+               return;
+
+       i40evf_del_mac_addr_by_addr(dev, dev->data->mac_addrs);
+
+       i40evf_add_mac_addr(dev, mac_addr, 0, 0);
+}