New upstream version 17.08
[deb_dpdk.git] / drivers / net / i40e / i40e_pf.c
index 0758503..100f8dc 100644 (file)
@@ -61,7 +61,7 @@
 
 static int
 i40e_pf_host_switch_queues(struct i40e_pf_vf *vf,
-                          struct i40e_virtchnl_queue_select *qsel,
+                          struct virtchnl_queue_select *qsel,
                           bool on);
 
 /**
@@ -128,7 +128,7 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
        struct i40e_pf *pf;
        uint16_t vf_id, abs_vf_id, vf_msix_num;
        int ret;
-       struct i40e_virtchnl_queue_select qsel;
+       struct virtchnl_queue_select qsel;
 
        if (vf == NULL)
                return -EINVAL;
@@ -139,7 +139,7 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
        abs_vf_id = vf_id + hw->func_caps.vf_base_id;
 
        /* Notify VF that we are in VFR progress */
-       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), I40E_VFR_INPROGRESS);
+       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), VIRTCHNL_VFR_INPROGRESS);
 
        /*
         * If require a SW VF reset, a VFLR interrupt will be generated,
@@ -167,7 +167,6 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
                PMD_DRV_LOG(ERR, "VF reset timeout");
                return -ETIMEDOUT;
        }
-
        /* This is not first time to do reset, do cleanup job first */
        if (vf->vsi) {
                /* Disable queues */
@@ -220,7 +219,7 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
        }
 
        /* Reset done, Set COMPLETE flag and clear reset bit */
-       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), I40E_VFR_COMPLETED);
+       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), VIRTCHNL_VFR_COMPLETED);
        val = I40E_READ_REG(hw, I40E_VPGEN_VFRTRIG(vf_id));
        val &= ~I40E_VPGEN_VFRTRIG_VFSWR_MASK;
        I40E_WRITE_REG(hw, I40E_VPGEN_VFRTRIG(vf_id), val);
@@ -248,7 +247,7 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset)
                return -EFAULT;
        }
 
-       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), I40E_VFR_VFACTIVE);
+       I40E_WRITE_REG(hw, I40E_VFGEN_RSTAT1(vf_id), VIRTCHNL_VFR_VFACTIVE);
 
        return ret;
 }
@@ -277,7 +276,7 @@ i40e_pf_host_send_msg_to_vf(struct i40e_pf_vf *vf,
 static void
 i40e_pf_host_process_cmd_version(struct i40e_pf_vf *vf, bool b_op)
 {
-       struct i40e_virtchnl_version_info info;
+       struct virtchnl_version_info info;
 
        /* Respond like a Linux PF host in order to support both DPDK VF and
         * Linux VF driver. The expense is original DPDK host specific feature
@@ -286,16 +285,16 @@ i40e_pf_host_process_cmd_version(struct i40e_pf_vf *vf, bool b_op)
         * DPDK VF also can't identify host driver by version number returned.
         * It always assume talking with Linux PF.
         */
-       info.major = I40E_VIRTCHNL_VERSION_MAJOR;
-       info.minor = I40E_VIRTCHNL_VERSION_MINOR_NO_VF_CAPS;
+       info.major = VIRTCHNL_VERSION_MAJOR;
+       info.minor = VIRTCHNL_VERSION_MINOR_NO_VF_CAPS;
 
        if (b_op)
-               i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_VERSION,
+               i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_VERSION,
                                            I40E_SUCCESS,
                                            (uint8_t *)&info,
                                            sizeof(info));
        else
-               i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_VERSION,
+               i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_VERSION,
                                            I40E_NOT_SUPPORTED,
                                            (uint8_t *)&info,
                                            sizeof(info));
@@ -313,22 +312,22 @@ i40e_pf_host_process_cmd_reset_vf(struct i40e_pf_vf *vf)
 static int
 i40e_pf_host_process_cmd_get_vf_resource(struct i40e_pf_vf *vf, bool b_op)
 {
-       struct i40e_virtchnl_vf_resource *vf_res = NULL;
+       struct virtchnl_vf_resource *vf_res = NULL;
        struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
        uint32_t len = 0;
        int ret = I40E_SUCCESS;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(vf,
-                                           I40E_VIRTCHNL_OP_GET_VF_RESOURCES,
+                                           VIRTCHNL_OP_GET_VF_RESOURCES,
                                            I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
 
        /* only have 1 VSI by default */
-       len =  sizeof(struct i40e_virtchnl_vf_resource) +
+       len =  sizeof(struct virtchnl_vf_resource) +
                                I40E_DEFAULT_VF_VSI_NUM *
-               sizeof(struct i40e_virtchnl_vsi_resource);
+               sizeof(struct virtchnl_vsi_resource);
 
        vf_res = rte_zmalloc("i40e_vf_res", len, 0);
        if (vf_res == NULL) {
@@ -339,21 +338,21 @@ i40e_pf_host_process_cmd_get_vf_resource(struct i40e_pf_vf *vf, bool b_op)
                goto send_msg;
        }
 
-       vf_res->vf_offload_flags = I40E_VIRTCHNL_VF_OFFLOAD_L2 |
-                               I40E_VIRTCHNL_VF_OFFLOAD_VLAN;
+       vf_res->vf_offload_flags = VIRTCHNL_VF_OFFLOAD_L2 |
+                               VIRTCHNL_VF_OFFLOAD_VLAN;
        vf_res->max_vectors = hw->func_caps.num_msix_vectors_vf;
        vf_res->num_queue_pairs = vf->vsi->nb_qps;
        vf_res->num_vsis = I40E_DEFAULT_VF_VSI_NUM;
 
        /* Change below setting if PF host can support more VSIs for VF */
-       vf_res->vsi_res[0].vsi_type = I40E_VSI_SRIOV;
+       vf_res->vsi_res[0].vsi_type = VIRTCHNL_VSI_SRIOV;
        vf_res->vsi_res[0].vsi_id = vf->vsi->vsi_id;
        vf_res->vsi_res[0].num_queue_pairs = vf->vsi->nb_qps;
        ether_addr_copy(&vf->mac_addr,
                (struct ether_addr *)vf_res->vsi_res[0].default_mac_addr);
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_GET_VF_RESOURCES,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_VF_RESOURCES,
                                        ret, (uint8_t *)vf_res, len);
        rte_free(vf_res);
 
@@ -363,7 +362,7 @@ send_msg:
 static int
 i40e_pf_host_hmc_config_rxq(struct i40e_hw *hw,
                            struct i40e_pf_vf *vf,
-                           struct i40e_virtchnl_rxq_info *rxq,
+                           struct virtchnl_rxq_info *rxq,
                            uint8_t crcstrip)
 {
        int err = I40E_SUCCESS;
@@ -431,7 +430,7 @@ i40e_vsi_get_tc_of_queue(struct i40e_vsi *vsi,
 static int
 i40e_pf_host_hmc_config_txq(struct i40e_hw *hw,
                            struct i40e_pf_vf *vf,
-                           struct i40e_virtchnl_txq_info *txq)
+                           struct virtchnl_txq_info *txq)
 {
        int err = I40E_SUCCESS;
        struct i40e_hmc_obj_txq tx_ctx;
@@ -480,14 +479,14 @@ i40e_pf_host_process_cmd_config_vsi_queues(struct i40e_pf_vf *vf,
 {
        struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
        struct i40e_vsi *vsi = vf->vsi;
-       struct i40e_virtchnl_vsi_queue_config_info *vc_vqci =
-               (struct i40e_virtchnl_vsi_queue_config_info *)msg;
-       struct i40e_virtchnl_queue_pair_info *vc_qpi;
+       struct virtchnl_vsi_queue_config_info *vc_vqci =
+               (struct virtchnl_vsi_queue_config_info *)msg;
+       struct virtchnl_queue_pair_info *vc_qpi;
        int i, ret = I40E_SUCCESS;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(vf,
-                                           I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES,
+                                           VIRTCHNL_OP_CONFIG_VSI_QUEUES,
                                            I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -511,9 +510,9 @@ i40e_pf_host_process_cmd_config_vsi_queues(struct i40e_pf_vf *vf,
 
                /*
                 * Apply VF RX queue setting to HMC.
-                * If the opcode is I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
+                * If the opcode is VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
                 * then the extra information of
-                * 'struct i40e_virtchnl_queue_pair_extra_info' is needed,
+                * 'struct virtchnl_queue_pair_extra_info' is needed,
                 * otherwise set the last parameter to NULL.
                 */
                if (i40e_pf_host_hmc_config_rxq(hw, vf, &vc_qpi[i].rxq,
@@ -533,7 +532,7 @@ i40e_pf_host_process_cmd_config_vsi_queues(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES,
                                                        ret, NULL, 0);
 
        return ret;
@@ -547,15 +546,15 @@ i40e_pf_host_process_cmd_config_vsi_queues_ext(struct i40e_pf_vf *vf,
 {
        struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
        struct i40e_vsi *vsi = vf->vsi;
-       struct i40e_virtchnl_vsi_queue_config_ext_info *vc_vqcei =
-               (struct i40e_virtchnl_vsi_queue_config_ext_info *)msg;
-       struct i40e_virtchnl_queue_pair_ext_info *vc_qpei;
+       struct virtchnl_vsi_queue_config_ext_info *vc_vqcei =
+               (struct virtchnl_vsi_queue_config_ext_info *)msg;
+       struct virtchnl_queue_pair_ext_info *vc_qpei;
        int i, ret = I40E_SUCCESS;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
+                       VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -578,9 +577,9 @@ i40e_pf_host_process_cmd_config_vsi_queues_ext(struct i40e_pf_vf *vf,
                }
                /*
                 * Apply VF RX queue setting to HMC.
-                * If the opcode is I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
+                * If the opcode is VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
                 * then the extra information of
-                * 'struct i40e_virtchnl_queue_pair_ext_info' is needed,
+                * 'struct virtchnl_queue_pair_ext_info' is needed,
                 * otherwise set the last parameter to NULL.
                 */
                if (i40e_pf_host_hmc_config_rxq(hw, vf, &vc_qpei[i].rxq,
@@ -600,7 +599,7 @@ i40e_pf_host_process_cmd_config_vsi_queues_ext(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT,
                                                                ret, NULL, 0);
 
        return ret;
@@ -608,7 +607,7 @@ send_msg:
 
 static void
 i40e_pf_config_irq_link_list(struct i40e_pf_vf *vf,
-                             struct i40e_virtchnl_vector_map *vvm)
+                             struct virtchnl_vector_map *vvm)
 {
 #define BITS_PER_CHAR 8
        uint64_t linklistmap = 0, tempmap;
@@ -711,9 +710,9 @@ i40e_pf_host_process_cmd_config_irq_map(struct i40e_pf_vf *vf,
        int ret = I40E_SUCCESS;
        struct i40e_pf *pf = vf->pf;
        struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
-       struct i40e_virtchnl_irq_map_info *irqmap =
-           (struct i40e_virtchnl_irq_map_info *)msg;
-       struct i40e_virtchnl_vector_map *map;
+       struct virtchnl_irq_map_info *irqmap =
+           (struct virtchnl_irq_map_info *)msg;
+       struct virtchnl_vector_map *map;
        int i;
        uint16_t vector_id;
        unsigned long qbit_max;
@@ -721,12 +720,12 @@ i40e_pf_host_process_cmd_config_irq_map(struct i40e_pf_vf *vf,
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP,
+                       VIRTCHNL_OP_CONFIG_IRQ_MAP,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
 
-       if (msg == NULL || msglen < sizeof(struct i40e_virtchnl_irq_map_info)) {
+       if (msg == NULL || msglen < sizeof(struct virtchnl_irq_map_info)) {
                PMD_DRV_LOG(ERR, "buffer too short");
                ret = I40E_ERR_PARAM;
                goto send_msg;
@@ -773,7 +772,7 @@ i40e_pf_host_process_cmd_config_irq_map(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_IRQ_MAP,
                                                        ret, NULL, 0);
 
        return ret;
@@ -781,7 +780,7 @@ send_msg:
 
 static int
 i40e_pf_host_switch_queues(struct i40e_pf_vf *vf,
-                          struct i40e_virtchnl_queue_select *qsel,
+                          struct virtchnl_queue_select *qsel,
                           bool on)
 {
        int ret = I40E_SUCCESS;
@@ -831,8 +830,8 @@ i40e_pf_host_process_cmd_enable_queues(struct i40e_pf_vf *vf,
                                       uint16_t msglen)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_queue_select *q_sel =
-               (struct i40e_virtchnl_queue_select *)msg;
+       struct virtchnl_queue_select *q_sel =
+               (struct virtchnl_queue_select *)msg;
 
        if (msg == NULL || msglen != sizeof(*q_sel)) {
                ret = I40E_ERR_PARAM;
@@ -841,7 +840,7 @@ i40e_pf_host_process_cmd_enable_queues(struct i40e_pf_vf *vf,
        ret = i40e_pf_host_switch_queues(vf, q_sel, true);
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_ENABLE_QUEUES,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_QUEUES,
                                                        ret, NULL, 0);
 
        return ret;
@@ -854,13 +853,13 @@ i40e_pf_host_process_cmd_disable_queues(struct i40e_pf_vf *vf,
                                        bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_queue_select *q_sel =
-               (struct i40e_virtchnl_queue_select *)msg;
+       struct virtchnl_queue_select *q_sel =
+               (struct virtchnl_queue_select *)msg;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_DISABLE_QUEUES,
+                       VIRTCHNL_OP_DISABLE_QUEUES,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -872,7 +871,7 @@ i40e_pf_host_process_cmd_disable_queues(struct i40e_pf_vf *vf,
        ret = i40e_pf_host_switch_queues(vf, q_sel, false);
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_DISABLE_QUEUES,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_QUEUES,
                                                        ret, NULL, 0);
 
        return ret;
@@ -886,8 +885,8 @@ i40e_pf_host_process_cmd_add_ether_address(struct i40e_pf_vf *vf,
                                           bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_ether_addr_list *addr_list =
-                       (struct i40e_virtchnl_ether_addr_list *)msg;
+       struct virtchnl_ether_addr_list *addr_list =
+                       (struct virtchnl_ether_addr_list *)msg;
        struct i40e_mac_filter_info filter;
        int i;
        struct ether_addr *mac;
@@ -895,7 +894,7 @@ i40e_pf_host_process_cmd_add_ether_address(struct i40e_pf_vf *vf,
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS,
+                       VIRTCHNL_OP_ADD_ETH_ADDR,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -920,7 +919,7 @@ i40e_pf_host_process_cmd_add_ether_address(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_ADD_ETH_ADDR,
                                                        ret, NULL, 0);
 
        return ret;
@@ -933,15 +932,15 @@ i40e_pf_host_process_cmd_del_ether_address(struct i40e_pf_vf *vf,
                                           bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_ether_addr_list *addr_list =
-               (struct i40e_virtchnl_ether_addr_list *)msg;
+       struct virtchnl_ether_addr_list *addr_list =
+               (struct virtchnl_ether_addr_list *)msg;
        int i;
        struct ether_addr *mac;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS,
+                       VIRTCHNL_OP_DEL_ETH_ADDR,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -962,7 +961,7 @@ i40e_pf_host_process_cmd_del_ether_address(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_DEL_ETH_ADDR,
                                                        ret, NULL, 0);
 
        return ret;
@@ -974,15 +973,15 @@ i40e_pf_host_process_cmd_add_vlan(struct i40e_pf_vf *vf,
                                bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_vlan_filter_list *vlan_filter_list =
-               (struct i40e_virtchnl_vlan_filter_list *)msg;
+       struct virtchnl_vlan_filter_list *vlan_filter_list =
+               (struct virtchnl_vlan_filter_list *)msg;
        int i;
        uint16_t *vid;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_ADD_VLAN,
+                       VIRTCHNL_OP_ADD_VLAN,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -1002,7 +1001,7 @@ i40e_pf_host_process_cmd_add_vlan(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_ADD_VLAN,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_ADD_VLAN,
                                                ret, NULL, 0);
 
        return ret;
@@ -1015,15 +1014,15 @@ i40e_pf_host_process_cmd_del_vlan(struct i40e_pf_vf *vf,
                                  bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_vlan_filter_list *vlan_filter_list =
-                       (struct i40e_virtchnl_vlan_filter_list *)msg;
+       struct virtchnl_vlan_filter_list *vlan_filter_list =
+                       (struct virtchnl_vlan_filter_list *)msg;
        int i;
        uint16_t *vid;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_DEL_VLAN,
+                       VIRTCHNL_OP_DEL_VLAN,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -1042,7 +1041,7 @@ i40e_pf_host_process_cmd_del_vlan(struct i40e_pf_vf *vf,
        }
 
 send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_DEL_VLAN,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_DEL_VLAN,
                                                ret, NULL, 0);
 
        return ret;
@@ -1056,15 +1055,15 @@ i40e_pf_host_process_cmd_config_promisc_mode(
                                        bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_promisc_info *promisc =
-                               (struct i40e_virtchnl_promisc_info *)msg;
+       struct virtchnl_promisc_info *promisc =
+                               (struct virtchnl_promisc_info *)msg;
        struct i40e_hw *hw = I40E_PF_TO_HW(vf->pf);
        bool unicast = FALSE, multicast = FALSE;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE,
+                       VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
@@ -1074,21 +1073,21 @@ i40e_pf_host_process_cmd_config_promisc_mode(
                goto send_msg;
        }
 
-       if (promisc->flags & I40E_FLAG_VF_UNICAST_PROMISC)
+       if (promisc->flags & FLAG_VF_UNICAST_PROMISC)
                unicast = TRUE;
        ret = i40e_aq_set_vsi_unicast_promiscuous(hw,
                        vf->vsi->seid, unicast, NULL, true);
        if (ret != I40E_SUCCESS)
                goto send_msg;
 
-       if (promisc->flags & I40E_FLAG_VF_MULTICAST_PROMISC)
+       if (promisc->flags & FLAG_VF_MULTICAST_PROMISC)
                multicast = TRUE;
        ret = i40e_aq_set_vsi_multicast_promiscuous(hw, vf->vsi->seid,
                                                multicast, NULL);
 
 send_msg:
        i40e_pf_host_send_msg_to_vf(vf,
-               I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE, ret, NULL, 0);
+               VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE, ret, NULL, 0);
 
        return ret;
 }
@@ -1099,12 +1098,12 @@ i40e_pf_host_process_cmd_get_stats(struct i40e_pf_vf *vf, bool b_op)
        i40e_update_vsi_stats(vf->vsi);
 
        if (b_op)
-               i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_GET_STATS,
+               i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS,
                                            I40E_SUCCESS,
                                            (uint8_t *)&vf->vsi->eth_stats,
                                            sizeof(vf->vsi->eth_stats));
        else
-               i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_GET_STATS,
+               i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_GET_STATS,
                                            I40E_NOT_SUPPORTED,
                                            (uint8_t *)&vf->vsi->eth_stats,
                                            sizeof(vf->vsi->eth_stats));
@@ -1113,37 +1112,47 @@ i40e_pf_host_process_cmd_get_stats(struct i40e_pf_vf *vf, bool b_op)
 }
 
 static int
-i40e_pf_host_process_cmd_cfg_vlan_offload(
-                                       struct i40e_pf_vf *vf,
-                                       uint8_t *msg,
-                                       uint16_t msglen,
-                                       bool b_op)
+i40e_pf_host_process_cmd_enable_vlan_strip(struct i40e_pf_vf *vf, bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_vlan_offload_info *offload =
-                       (struct i40e_virtchnl_vlan_offload_info *)msg;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
                        vf,
-                       I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD,
+                       VIRTCHNL_OP_ENABLE_VLAN_STRIPPING,
                        I40E_NOT_SUPPORTED, NULL, 0);
                return ret;
        }
 
-       if (msg == NULL || msglen != sizeof(*offload)) {
-               ret = I40E_ERR_PARAM;
-               goto send_msg;
+       ret = i40e_vsi_config_vlan_stripping(vf->vsi, TRUE);
+       if (ret != 0)
+               PMD_DRV_LOG(ERR, "Failed to enable vlan stripping");
+
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING,
+                                   ret, NULL, 0);
+
+       return ret;
+}
+
+static int
+i40e_pf_host_process_cmd_disable_vlan_strip(struct i40e_pf_vf *vf, bool b_op)
+{
+       int ret = I40E_SUCCESS;
+
+       if (!b_op) {
+               i40e_pf_host_send_msg_to_vf(
+                       vf,
+                       VIRTCHNL_OP_DISABLE_VLAN_STRIPPING,
+                       I40E_NOT_SUPPORTED, NULL, 0);
+               return ret;
        }
 
-       ret = i40e_vsi_config_vlan_stripping(vf->vsi,
-                                               !!offload->enable_vlan_strip);
+       ret = i40e_vsi_config_vlan_stripping(vf->vsi, FALSE);
        if (ret != 0)
-               PMD_DRV_LOG(ERR, "Failed to configure vlan stripping");
+               PMD_DRV_LOG(ERR, "Failed to disable vlan stripping");
 
-send_msg:
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD,
-                                       ret, NULL, 0);
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING,
+                                   ret, NULL, 0);
 
        return ret;
 }
@@ -1155,8 +1164,8 @@ i40e_pf_host_process_cmd_cfg_pvid(struct i40e_pf_vf *vf,
                                        bool b_op)
 {
        int ret = I40E_SUCCESS;
-       struct i40e_virtchnl_pvid_info  *tpid_info =
-                       (struct i40e_virtchnl_pvid_info *)msg;
+       struct virtchnl_pvid_info  *tpid_info =
+                       (struct virtchnl_pvid_info *)msg;
 
        if (!b_op) {
                i40e_pf_host_send_msg_to_vf(
@@ -1183,39 +1192,39 @@ send_msg:
 void
 i40e_notify_vf_link_status(struct rte_eth_dev *dev, struct i40e_pf_vf *vf)
 {
-       struct i40e_virtchnl_pf_event event;
+       struct virtchnl_pf_event event;
 
-       event.event = I40E_VIRTCHNL_EVENT_LINK_CHANGE;
+       event.event = VIRTCHNL_EVENT_LINK_CHANGE;
        event.event_data.link_event.link_status =
                dev->data->dev_link.link_status;
 
-       /* need to convert the ETH_SPEED_xxx into I40E_LINK_SPEED_xxx */
+       /* need to convert the ETH_SPEED_xxx into VIRTCHNL_LINK_SPEED_xxx */
        switch (dev->data->dev_link.link_speed) {
        case ETH_SPEED_NUM_100M:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_100MB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_100MB;
                break;
        case ETH_SPEED_NUM_1G:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_1GB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_1GB;
                break;
        case ETH_SPEED_NUM_10G:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_10GB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_10GB;
                break;
        case ETH_SPEED_NUM_20G:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_20GB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_20GB;
                break;
        case ETH_SPEED_NUM_25G:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_25GB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_25GB;
                break;
        case ETH_SPEED_NUM_40G:
-               event.event_data.link_event.link_speed = I40E_LINK_SPEED_40GB;
+               event.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_40GB;
                break;
        default:
                event.event_data.link_event.link_speed =
-                       I40E_LINK_SPEED_UNKNOWN;
+                       VIRTCHNL_LINK_SPEED_UNKNOWN;
                break;
        }
 
-       i40e_pf_host_send_msg_to_vf(vf, I40E_VIRTCHNL_OP_EVENT,
+       i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_EVENT,
                I40E_SUCCESS, (uint8_t *)&event, sizeof(event));
 }
 
@@ -1231,7 +1240,7 @@ i40e_pf_host_handle_vf_msg(struct rte_eth_dev *dev,
        struct i40e_pf_vf *vf;
        /* AdminQ will pass absolute VF id, transfer to internal vf id */
        uint16_t vf_id = abs_vf_id - hw->func_caps.vf_base_id;
-       struct rte_pmd_i40e_mb_event_param cb_param;
+       struct rte_pmd_i40e_mb_event_param ret_param;
        bool b_op = TRUE;
 
        if (vf_id > pf->vf_num - 1 || !pf->vfs) {
@@ -1251,100 +1260,104 @@ i40e_pf_host_handle_vf_msg(struct rte_eth_dev *dev,
         * initialise structure to send to user application
         * will return response from user in retval field
         */
-       cb_param.retval = RTE_PMD_I40E_MB_EVENT_PROCEED;
-       cb_param.vfid = vf_id;
-       cb_param.msg_type = opcode;
-       cb_param.msg = (void *)msg;
-       cb_param.msglen = msglen;
+       ret_param.retval = RTE_PMD_I40E_MB_EVENT_PROCEED;
+       ret_param.vfid = vf_id;
+       ret_param.msg_type = opcode;
+       ret_param.msg = (void *)msg;
+       ret_param.msglen = msglen;
 
        /**
         * Ask user application if we're allowed to perform those functions.
-        * If we get cb_param.retval == RTE_PMD_I40E_MB_EVENT_PROCEED,
+        * If we get ret_param.retval == RTE_PMD_I40E_MB_EVENT_PROCEED,
         * then business as usual.
         * If RTE_PMD_I40E_MB_EVENT_NOOP_ACK or RTE_PMD_I40E_MB_EVENT_NOOP_NACK,
         * do nothing and send not_supported to VF. As PF must send a response
         * to VF and ACK/NACK is not defined.
         */
-       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX, &cb_param);
-       if (cb_param.retval != RTE_PMD_I40E_MB_EVENT_PROCEED) {
+       _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_VF_MBOX,
+                                     NULL, &ret_param);
+       if (ret_param.retval != RTE_PMD_I40E_MB_EVENT_PROCEED) {
                PMD_DRV_LOG(WARNING, "VF to PF message(%d) is not permitted!",
                            opcode);
                b_op = FALSE;
        }
 
        switch (opcode) {
-       case I40E_VIRTCHNL_OP_VERSION :
+       case VIRTCHNL_OP_VERSION:
                PMD_DRV_LOG(INFO, "OP_VERSION received");
                i40e_pf_host_process_cmd_version(vf, b_op);
                break;
-       case I40E_VIRTCHNL_OP_RESET_VF :
+       case VIRTCHNL_OP_RESET_VF:
                PMD_DRV_LOG(INFO, "OP_RESET_VF received");
                i40e_pf_host_process_cmd_reset_vf(vf);
                break;
-       case I40E_VIRTCHNL_OP_GET_VF_RESOURCES:
+       case VIRTCHNL_OP_GET_VF_RESOURCES:
                PMD_DRV_LOG(INFO, "OP_GET_VF_RESOURCES received");
                i40e_pf_host_process_cmd_get_vf_resource(vf, b_op);
                break;
-       case I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES:
+       case VIRTCHNL_OP_CONFIG_VSI_QUEUES:
                PMD_DRV_LOG(INFO, "OP_CONFIG_VSI_QUEUES received");
                i40e_pf_host_process_cmd_config_vsi_queues(vf, msg,
                                                           msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT:
+       case VIRTCHNL_OP_CONFIG_VSI_QUEUES_EXT:
                PMD_DRV_LOG(INFO, "OP_CONFIG_VSI_QUEUES_EXT received");
                i40e_pf_host_process_cmd_config_vsi_queues_ext(vf, msg,
                                                               msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP:
+       case VIRTCHNL_OP_CONFIG_IRQ_MAP:
                PMD_DRV_LOG(INFO, "OP_CONFIG_IRQ_MAP received");
                i40e_pf_host_process_cmd_config_irq_map(vf, msg, msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_ENABLE_QUEUES:
+       case VIRTCHNL_OP_ENABLE_QUEUES:
                PMD_DRV_LOG(INFO, "OP_ENABLE_QUEUES received");
                if (b_op) {
                        i40e_pf_host_process_cmd_enable_queues(vf, msg, msglen);
                        i40e_notify_vf_link_status(dev, vf);
                } else {
                        i40e_pf_host_send_msg_to_vf(
-                               vf, I40E_VIRTCHNL_OP_ENABLE_QUEUES,
+                               vf, VIRTCHNL_OP_ENABLE_QUEUES,
                                I40E_NOT_SUPPORTED, NULL, 0);
                }
                break;
-       case I40E_VIRTCHNL_OP_DISABLE_QUEUES:
+       case VIRTCHNL_OP_DISABLE_QUEUES:
                PMD_DRV_LOG(INFO, "OP_DISABLE_QUEUE received");
                i40e_pf_host_process_cmd_disable_queues(vf, msg, msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS:
+       case VIRTCHNL_OP_ADD_ETH_ADDR:
                PMD_DRV_LOG(INFO, "OP_ADD_ETHER_ADDRESS received");
                i40e_pf_host_process_cmd_add_ether_address(vf, msg,
                                                           msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS:
+       case VIRTCHNL_OP_DEL_ETH_ADDR:
                PMD_DRV_LOG(INFO, "OP_DEL_ETHER_ADDRESS received");
                i40e_pf_host_process_cmd_del_ether_address(vf, msg,
                                                           msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_ADD_VLAN:
+       case VIRTCHNL_OP_ADD_VLAN:
                PMD_DRV_LOG(INFO, "OP_ADD_VLAN received");
                i40e_pf_host_process_cmd_add_vlan(vf, msg, msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_DEL_VLAN:
+       case VIRTCHNL_OP_DEL_VLAN:
                PMD_DRV_LOG(INFO, "OP_DEL_VLAN received");
                i40e_pf_host_process_cmd_del_vlan(vf, msg, msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE:
+       case VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE:
                PMD_DRV_LOG(INFO, "OP_CONFIG_PROMISCUOUS_MODE received");
                i40e_pf_host_process_cmd_config_promisc_mode(vf, msg,
                                                             msglen, b_op);
                break;
-       case I40E_VIRTCHNL_OP_GET_STATS:
+       case VIRTCHNL_OP_GET_STATS:
                PMD_DRV_LOG(INFO, "OP_GET_STATS received");
                i40e_pf_host_process_cmd_get_stats(vf, b_op);
                break;
-       case I40E_VIRTCHNL_OP_CFG_VLAN_OFFLOAD:
-               PMD_DRV_LOG(INFO, "OP_CFG_VLAN_OFFLOAD received");
-               i40e_pf_host_process_cmd_cfg_vlan_offload(vf, msg,
-                                                         msglen, b_op);
+       case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING:
+               PMD_DRV_LOG(INFO, "OP_ENABLE_VLAN_STRIPPING received");
+               i40e_pf_host_process_cmd_enable_vlan_strip(vf, b_op);
+               break;
+       case VIRTCHNL_OP_DISABLE_VLAN_STRIPPING:
+               PMD_DRV_LOG(INFO, "OP_DISABLE_VLAN_STRIPPING received");
+               i40e_pf_host_process_cmd_disable_vlan_strip(vf, b_op);
                break;
        case I40E_VIRTCHNL_OP_CFG_VLAN_PVID:
                PMD_DRV_LOG(INFO, "OP_CFG_VLAN_PVID received");