net/ngbe: support MAC filters
[dpdk.git] / drivers / net / iavf / iavf_vchnl.c
index 0026120..145b059 100644 (file)
@@ -13,6 +13,7 @@
 #include <rte_common.h>
 
 #include <rte_debug.h>
+#include <rte_alarm.h>
 #include <rte_atomic.h>
 #include <rte_eal.h>
 #include <rte_ether.h>
@@ -23,8 +24,8 @@
 #include "iavf.h"
 #include "iavf_rxtx.h"
 
-#define MAX_TRY_TIMES 200
-#define ASQ_DELAY_MS  10
+#define MAX_TRY_TIMES 2000
+#define ASQ_DELAY_MS  1
 
 static uint32_t
 iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed)
@@ -71,7 +72,6 @@ iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
 {
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
-       struct rte_eth_dev *dev = adapter->eth_dev;
        struct iavf_arq_event_info event;
        enum iavf_aq_result result = IAVF_MSG_NON;
        enum virtchnl_ops opcode;
@@ -113,7 +113,7 @@ iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
                                speed = vpe->event_data.link_event.link_speed;
                                vf->link_speed = iavf_convert_link_speed(speed);
                        }
-                       iavf_dev_link_update(dev, 0);
+                       iavf_dev_link_update(vf->eth_dev, 0);
                        PMD_DRV_LOG(INFO, "Link status update:%s",
                                        vf->link_up ? "up" : "down");
                        break;
@@ -143,7 +143,8 @@ iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
 }
 
 static int
-iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
+iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args,
+       int async)
 {
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
@@ -155,8 +156,14 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
        if (vf->vf_reset)
                return -EIO;
 
-       if (_atomic_set_cmd(vf, args->ops))
-               return -1;
+
+       if (async) {
+               if (_atomic_set_async_response_cmd(vf, args->ops))
+                       return -1;
+       } else {
+               if (_atomic_set_cmd(vf, args->ops))
+                       return -1;
+       }
 
        ret = iavf_aq_send_msg_to_pf(hw, args->ops, IAVF_SUCCESS,
                                    args->in_args, args->in_args_size, NULL);
@@ -181,7 +188,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
                                                   args->out_buffer);
                        if (result == IAVF_MSG_CMD)
                                break;
-                       rte_delay_ms(ASQ_DELAY_MS);
+                       iavf_msec_delay(ASQ_DELAY_MS);
                } while (i++ < MAX_TRY_TIMES);
                if (i >= MAX_TRY_TIMES ||
                    vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
@@ -207,7 +214,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
                                err = -1;
                                break;
                        }
-                       rte_delay_ms(ASQ_DELAY_MS);
+                       iavf_msec_delay(ASQ_DELAY_MS);
                        /* If don't read msg or read sys event, continue */
                } while (i++ < MAX_TRY_TIMES);
                if (i >= MAX_TRY_TIMES ||
@@ -225,7 +232,7 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
                do {
                        if (vf->pend_cmd == VIRTCHNL_OP_UNKNOWN)
                                break;
-                       rte_delay_ms(ASQ_DELAY_MS);
+                       iavf_msec_delay(ASQ_DELAY_MS);
                        /* If don't read msg or read sys event, continue */
                } while (i++ < MAX_TRY_TIMES);
 
@@ -252,9 +259,11 @@ static void
 iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
                        uint16_t msglen)
 {
+       struct iavf_adapter *adapter =
+               IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct iavf_info *vf = &adapter->vf;
        struct virtchnl_pf_event *pf_msg =
                        (struct virtchnl_pf_event *)msg;
-       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
        if (msglen < sizeof(struct virtchnl_pf_event)) {
                PMD_DRV_LOG(DEBUG, "Error event");
@@ -330,18 +339,42 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
                case iavf_aqc_opc_send_msg_to_vf:
                        if (msg_opc == VIRTCHNL_OP_EVENT) {
                                iavf_handle_pf_event_msg(dev, info.msg_buf,
-                                                       info.msg_len);
+                                               info.msg_len);
                        } else {
+                               /* check for inline IPsec events */
+                               struct inline_ipsec_msg *imsg =
+                                       (struct inline_ipsec_msg *)info.msg_buf;
+                               struct rte_eth_event_ipsec_desc desc;
+                               if (msg_opc ==
+                                       VIRTCHNL_OP_INLINE_IPSEC_CRYPTO &&
+                                       imsg->ipsec_opcode ==
+                                               INLINE_IPSEC_OP_EVENT) {
+                                       struct virtchnl_ipsec_event *ev =
+                                                       imsg->ipsec_data.event;
+                                       desc.subtype =
+                                               RTE_ETH_EVENT_IPSEC_UNKNOWN;
+                                       desc.metadata = ev->ipsec_event_data;
+                                       rte_eth_dev_callback_process(dev,
+                                                       RTE_ETH_EVENT_IPSEC,
+                                                       &desc);
+                                       return;
+                               }
+
                                /* read message and it's expected one */
-                               if (msg_opc == vf->pend_cmd)
-                                       _notify_cmd(vf, msg_ret);
-                               else
-                                       PMD_DRV_LOG(ERR, "command mismatch,"
-                                                   "expect %u, get %u",
-                                                   vf->pend_cmd, msg_opc);
+                               if (msg_opc == vf->pend_cmd) {
+                                       uint32_t cmd_count =
+                                       __atomic_sub_fetch(&vf->pend_cmd_count,
+                                                       1, __ATOMIC_RELAXED);
+                                       if (cmd_count == 0)
+                                               _notify_cmd(vf, msg_ret);
+                               } else {
+                                       PMD_DRV_LOG(ERR,
+                                       "command mismatch, expect %u, get %u",
+                                               vf->pend_cmd, msg_opc);
+                               }
                                PMD_DRV_LOG(DEBUG,
-                                           "adminq response is received,"
-                                           " opcode = %d", msg_opc);
+                               "adminq response is received, opcode = %d",
+                                               msg_opc);
                        }
                        break;
                default:
@@ -365,7 +398,7 @@ iavf_enable_vlan_strip(struct iavf_adapter *adapter)
        args.in_args_size = 0;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret)
                PMD_DRV_LOG(ERR, "Failed to execute command of"
                            " OP_ENABLE_VLAN_STRIPPING");
@@ -386,7 +419,7 @@ iavf_disable_vlan_strip(struct iavf_adapter *adapter)
        args.in_args_size = 0;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret)
                PMD_DRV_LOG(ERR, "Failed to execute command of"
                            " OP_DISABLE_VLAN_STRIPPING");
@@ -415,7 +448,7 @@ iavf_check_api_version(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_INIT_LOG(ERR, "Fail to execute command of OP_VERSION");
                return err;
@@ -467,12 +500,14 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
                VIRTCHNL_VF_OFFLOAD_REQ_QUEUES |
                VIRTCHNL_VF_OFFLOAD_CRC |
                VIRTCHNL_VF_OFFLOAD_VLAN_V2 |
-               VIRTCHNL_VF_LARGE_NUM_QPAIRS;
+               VIRTCHNL_VF_LARGE_NUM_QPAIRS |
+               VIRTCHNL_VF_OFFLOAD_QOS |
++              VIRTCHNL_VF_OFFLOAD_INLINE_IPSEC_CRYPTO;
 
        args.in_args = (uint8_t *)&caps;
        args.in_args_size = sizeof(caps);
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
 
        if (err) {
                PMD_DRV_LOG(ERR,
@@ -517,7 +552,7 @@ iavf_get_supported_rxdid(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret) {
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_GET_SUPPORTED_RXDIDS");
@@ -561,7 +596,7 @@ iavf_config_vlan_strip_v2(struct iavf_adapter *adapter, bool enable)
        args.in_args_size = sizeof(vlan_strip);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret)
                PMD_DRV_LOG(ERR, "fail to execute command %s",
                            enable ? "VIRTCHNL_OP_ENABLE_VLAN_STRIPPING_V2" :
@@ -601,7 +636,7 @@ iavf_config_vlan_insert_v2(struct iavf_adapter *adapter, bool enable)
        args.in_args_size = sizeof(vlan_insert);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret)
                PMD_DRV_LOG(ERR, "fail to execute command %s",
                            enable ? "VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2" :
@@ -644,7 +679,7 @@ iavf_add_del_vlan_v2(struct iavf_adapter *adapter, uint16_t vlanid, bool add)
        args.in_args_size = sizeof(vlan_filter);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "fail to execute command %s",
                            add ? "OP_ADD_VLAN_V2" :  "OP_DEL_VLAN_V2");
@@ -665,7 +700,7 @@ iavf_get_vlan_offload_caps_v2(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       ret = iavf_execute_vf_cmd(adapter, &args);
+       ret = iavf_execute_vf_cmd(adapter, &args, 0);
        if (ret) {
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of VIRTCHNL_OP_GET_OFFLOAD_VLAN_V2_CAPS");
@@ -688,15 +723,15 @@ iavf_enable_queues(struct iavf_adapter *adapter)
        memset(&queue_select, 0, sizeof(queue_select));
        queue_select.vsi_id = vf->vsi_res->vsi_id;
 
-       queue_select.rx_queues = BIT(adapter->eth_dev->data->nb_rx_queues) - 1;
-       queue_select.tx_queues = BIT(adapter->eth_dev->data->nb_tx_queues) - 1;
+       queue_select.rx_queues = BIT(adapter->dev_data->nb_rx_queues) - 1;
+       queue_select.tx_queues = BIT(adapter->dev_data->nb_tx_queues) - 1;
 
        args.ops = VIRTCHNL_OP_ENABLE_QUEUES;
        args.in_args = (u8 *)&queue_select;
        args.in_args_size = sizeof(queue_select);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_ENABLE_QUEUES");
@@ -716,15 +751,15 @@ iavf_disable_queues(struct iavf_adapter *adapter)
        memset(&queue_select, 0, sizeof(queue_select));
        queue_select.vsi_id = vf->vsi_res->vsi_id;
 
-       queue_select.rx_queues = BIT(adapter->eth_dev->data->nb_rx_queues) - 1;
-       queue_select.tx_queues = BIT(adapter->eth_dev->data->nb_tx_queues) - 1;
+       queue_select.rx_queues = BIT(adapter->dev_data->nb_rx_queues) - 1;
+       queue_select.tx_queues = BIT(adapter->dev_data->nb_tx_queues) - 1;
 
        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;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_DISABLE_QUEUES");
@@ -757,7 +792,7 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid,
        args.in_args_size = sizeof(queue_select);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "Failed to execute command of %s",
                            on ? "OP_ENABLE_QUEUES" : "OP_DISABLE_QUEUES");
@@ -787,19 +822,19 @@ iavf_enable_queues_lv(struct iavf_adapter *adapter)
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].type = VIRTCHNL_QUEUE_TYPE_TX;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].start_queue_id = 0;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].num_queues =
-               adapter->eth_dev->data->nb_tx_queues;
+               adapter->dev_data->nb_tx_queues;
 
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].type = VIRTCHNL_QUEUE_TYPE_RX;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].start_queue_id = 0;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].num_queues =
-               adapter->eth_dev->data->nb_rx_queues;
+               adapter->dev_data->nb_rx_queues;
 
        args.ops = VIRTCHNL_OP_ENABLE_QUEUES_V2;
        args.in_args = (u8 *)queue_select;
        args.in_args_size = len;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_ENABLE_QUEUES_V2");
@@ -831,19 +866,19 @@ iavf_disable_queues_lv(struct iavf_adapter *adapter)
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].type = VIRTCHNL_QUEUE_TYPE_TX;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].start_queue_id = 0;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_TX].num_queues =
-               adapter->eth_dev->data->nb_tx_queues;
+               adapter->dev_data->nb_tx_queues;
 
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].type = VIRTCHNL_QUEUE_TYPE_RX;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].start_queue_id = 0;
        queue_chunk[VIRTCHNL_QUEUE_TYPE_RX].num_queues =
-               adapter->eth_dev->data->nb_rx_queues;
+               adapter->dev_data->nb_rx_queues;
 
        args.ops = VIRTCHNL_OP_DISABLE_QUEUES_V2;
        args.in_args = (u8 *)queue_select;
        args.in_args_size = len;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_DISABLE_QUEUES_V2");
@@ -889,7 +924,7 @@ iavf_switch_queue_lv(struct iavf_adapter *adapter, uint16_t qid,
        args.in_args_size = len;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "Failed to execute command of %s",
                            on ? "OP_ENABLE_QUEUES_V2" : "OP_DISABLE_QUEUES_V2");
@@ -921,7 +956,7 @@ iavf_configure_rss_lut(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_CONFIG_RSS_LUT");
@@ -953,7 +988,7 @@ iavf_configure_rss_key(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_CONFIG_RSS_KEY");
@@ -967,9 +1002,9 @@ iavf_configure_queues(struct iavf_adapter *adapter,
                uint16_t num_queue_pairs, uint16_t index)
 {
        struct iavf_rx_queue **rxq =
-               (struct iavf_rx_queue **)adapter->eth_dev->data->rx_queues;
+               (struct iavf_rx_queue **)adapter->dev_data->rx_queues;
        struct iavf_tx_queue **txq =
-               (struct iavf_tx_queue **)adapter->eth_dev->data->tx_queues;
+               (struct iavf_tx_queue **)adapter->dev_data->tx_queues;
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
        struct virtchnl_vsi_queue_config_info *vc_config;
        struct virtchnl_queue_pair_info *vc_qp;
@@ -993,7 +1028,7 @@ iavf_configure_queues(struct iavf_adapter *adapter,
                vc_qp->txq.queue_id = i;
 
                /* Virtchnnl configure tx queues by pairs */
-               if (i < adapter->eth_dev->data->nb_tx_queues) {
+               if (i < adapter->dev_data->nb_tx_queues) {
                        vc_qp->txq.ring_len = txq[i]->nb_tx_desc;
                        vc_qp->txq.dma_ring_addr = txq[i]->tx_ring_phys_addr;
                }
@@ -1002,7 +1037,7 @@ iavf_configure_queues(struct iavf_adapter *adapter,
                vc_qp->rxq.queue_id = i;
                vc_qp->rxq.max_pkt_size = vf->max_pkt_len;
 
-               if (i >= adapter->eth_dev->data->nb_rx_queues)
+               if (i >= adapter->dev_data->nb_rx_queues)
                        continue;
 
                /* Virtchnnl configure rx queues by pairs */
@@ -1045,7 +1080,7 @@ iavf_configure_queues(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "Failed to execute command of"
                            " VIRTCHNL_OP_CONFIG_VSI_QUEUES");
@@ -1071,7 +1106,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)
                return -ENOMEM;
 
        map_info->num_vectors = vf->nb_msix;
-       for (i = 0; i < adapter->eth_dev->data->nb_rx_queues; i++) {
+       for (i = 0; i < adapter->dev_data->nb_rx_queues; i++) {
                vecmap =
                    &map_info->vecmap[vf->qv_map[i].vector_id - vf->msix_base];
                vecmap->vsi_id = vf->vsi_res->vsi_id;
@@ -1086,7 +1121,7 @@ iavf_config_irq_map(struct iavf_adapter *adapter)
        args.in_args_size = len;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "fail to execute command OP_CONFIG_IRQ_MAP");
 
@@ -1127,7 +1162,7 @@ iavf_config_irq_map_lv(struct iavf_adapter *adapter, uint16_t num,
        args.in_args_size = len;
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "fail to execute command OP_MAP_QUEUE_VECTOR");
 
@@ -1150,7 +1185,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
                j = 0;
                len = sizeof(struct virtchnl_ether_addr_list);
                for (i = begin; i < IAVF_NUM_MACADDR_MAX; i++, next_begin++) {
-                       addr = &adapter->eth_dev->data->mac_addrs[i];
+                       addr = &adapter->dev_data->mac_addrs[i];
                        if (rte_is_zero_ether_addr(addr))
                                continue;
                        len += sizeof(struct virtchnl_ether_addr);
@@ -1167,16 +1202,16 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
                }
 
                for (i = begin; i < next_begin; i++) {
-                       addr = &adapter->eth_dev->data->mac_addrs[i];
+                       addr = &adapter->dev_data->mac_addrs[i];
                        if (rte_is_zero_ether_addr(addr))
                                continue;
                        rte_memcpy(list->list[j].addr, addr->addr_bytes,
                                   sizeof(addr->addr_bytes));
-                       list->list[j].type = VIRTCHNL_ETHER_ADDR_EXTRA;
-                       PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x",
-                                   addr->addr_bytes[0], addr->addr_bytes[1],
-                                   addr->addr_bytes[2], addr->addr_bytes[3],
-                                   addr->addr_bytes[4], addr->addr_bytes[5]);
+                       list->list[j].type = (j == 0 ?
+                                             VIRTCHNL_ETHER_ADDR_PRIMARY :
+                                             VIRTCHNL_ETHER_ADDR_EXTRA);
+                       PMD_DRV_LOG(DEBUG, "add/rm mac:" RTE_ETHER_ADDR_PRT_FMT,
+                                   RTE_ETHER_ADDR_BYTES(addr));
                        j++;
                }
                list->vsi_id = vf->vsi_res->vsi_id;
@@ -1187,7 +1222,7 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)
                args.in_args_size = len;
                args.out_buffer = vf->aq_resp;
                args.out_size = IAVF_AQ_BUF_SZ;
-               err = iavf_execute_vf_cmd(adapter, &args);
+               err = iavf_execute_vf_cmd(adapter, &args, 0);
                if (err)
                        PMD_DRV_LOG(ERR, "fail to execute command %s",
                                    add ? "OP_ADD_ETHER_ADDRESS" :
@@ -1214,7 +1249,7 @@ iavf_query_stats(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR, "fail to execute command OP_GET_STATS");
                *pstats = NULL;
@@ -1249,14 +1284,14 @@ iavf_config_promisc(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
 
        if (err) {
                PMD_DRV_LOG(ERR,
                            "fail to execute command CONFIG_PROMISCUOUS_MODE");
 
-               if (err == IAVF_NOT_SUPPORTED)
-                       return -ENOTSUP;
+               if (err == -ENOTSUP)
+                       return err;
 
                return -EAGAIN;
        }
@@ -1289,7 +1324,7 @@ iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct rte_ether_addr *addr,
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "fail to execute command %s",
                            add ? "OP_ADD_ETH_ADDR" :  "OP_DEL_ETH_ADDR");
@@ -1316,7 +1351,7 @@ iavf_add_del_vlan(struct iavf_adapter *adapter, uint16_t vlanid, bool add)
        args.in_args_size = sizeof(cmd_buffer);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR, "fail to execute command %s",
                            add ? "OP_ADD_VLAN" :  "OP_DEL_VLAN");
@@ -1343,7 +1378,7 @@ iavf_fdir_add(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR, "fail to execute command OP_ADD_FDIR_FILTER");
                return err;
@@ -1403,7 +1438,7 @@ iavf_fdir_del(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR, "fail to execute command OP_DEL_FDIR_FILTER");
                return err;
@@ -1450,7 +1485,7 @@ iavf_fdir_check(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR, "fail to check flow direcotor rule");
                return err;
@@ -1491,7 +1526,7 @@ iavf_add_del_rss_cfg(struct iavf_adapter *adapter,
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of %s",
@@ -1514,7 +1549,7 @@ iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_GET_RSS_HENA_CAPS");
@@ -1540,7 +1575,7 @@ iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err)
                PMD_DRV_LOG(ERR,
                            "Failed to execute command of OP_SET_RSS_HENA");
@@ -1548,6 +1583,59 @@ iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena)
        return err;
 }
 
+int
+iavf_get_qos_cap(struct iavf_adapter *adapter)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct iavf_cmd_info args;
+       uint32_t len;
+       int err;
+
+       args.ops = VIRTCHNL_OP_GET_QOS_CAPS;
+       args.in_args = NULL;
+       args.in_args_size = 0;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
+
+       if (err) {
+               PMD_DRV_LOG(ERR,
+                           "Failed to execute command of OP_GET_VF_RESOURCE");
+               return -1;
+       }
+
+       len =  sizeof(struct virtchnl_qos_cap_list) +
+               IAVF_MAX_TRAFFIC_CLASS * sizeof(struct virtchnl_qos_cap_elem);
+
+       rte_memcpy(vf->qos_cap, args.out_buffer,
+                  RTE_MIN(args.out_size, len));
+
+       return 0;
+}
+
+int iavf_set_q_tc_map(struct rte_eth_dev *dev,
+               struct virtchnl_queue_tc_mapping *q_tc_mapping, uint16_t size)
+{
+       struct iavf_adapter *adapter =
+                       IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+       struct iavf_cmd_info args;
+       int err;
+
+       memset(&args, 0, sizeof(args));
+       args.ops = VIRTCHNL_OP_CONFIG_QUEUE_TC_MAP;
+       args.in_args = (uint8_t *)q_tc_mapping;
+       args.in_args_size = size;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
+       if (err)
+               PMD_DRV_LOG(ERR, "Failed to execute command of"
+                           " VIRTCHNL_OP_CONFIG_TC_MAP");
+       return err;
+}
+
 int
 iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
                        struct rte_ether_addr *mc_addrs,
@@ -1570,13 +1658,8 @@ iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
 
        for (i = 0; i < mc_addrs_num; i++) {
                if (!IAVF_IS_MULTICAST(mc_addrs[i].addr_bytes)) {
-                       PMD_DRV_LOG(ERR, "Invalid mac:%x:%x:%x:%x:%x:%x",
-                                   mc_addrs[i].addr_bytes[0],
-                                   mc_addrs[i].addr_bytes[1],
-                                   mc_addrs[i].addr_bytes[2],
-                                   mc_addrs[i].addr_bytes[3],
-                                   mc_addrs[i].addr_bytes[4],
-                                   mc_addrs[i].addr_bytes[5]);
+                       PMD_DRV_LOG(ERR, "Invalid mac:" RTE_ETHER_ADDR_PRT_FMT,
+                                   RTE_ETHER_ADDR_BYTES(&mc_addrs[i]));
                        return -EINVAL;
                }
 
@@ -1591,7 +1674,7 @@ iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
                i * sizeof(struct virtchnl_ether_addr);
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
 
        if (err) {
                PMD_DRV_LOG(ERR, "fail to execute command %s",
@@ -1603,9 +1686,10 @@ iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,
 }
 
 int
-iavf_request_queues(struct iavf_adapter *adapter, uint16_t num)
+iavf_request_queues(struct rte_eth_dev *dev, uint16_t num)
 {
-       struct rte_eth_dev *dev = adapter->eth_dev;
+       struct iavf_adapter *adapter =
+               IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
        struct iavf_info *vf =  IAVF_DEV_PRIVATE_TO_VF(adapter);
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        struct virtchnl_vf_res_request vfres;
@@ -1631,13 +1715,20 @@ iavf_request_queues(struct iavf_adapter *adapter, uint16_t num)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       /*
-        * disable interrupt to avoid the admin queue message to be read
-        * before iavf_read_msg_from_pf.
-        */
-       rte_intr_disable(&pci_dev->intr_handle);
-       err = iavf_execute_vf_cmd(adapter, &args);
-       rte_intr_enable(&pci_dev->intr_handle);
+       if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) {
+               /* disable interrupt to avoid the admin queue message to be read
+                * before iavf_read_msg_from_pf.
+                */
+               rte_intr_disable(pci_dev->intr_handle);
+               err = iavf_execute_vf_cmd(adapter, &args, 0);
+               rte_intr_enable(pci_dev->intr_handle);
+       } else {
+               rte_eal_alarm_cancel(iavf_dev_alarm_handler, dev);
+               err = iavf_execute_vf_cmd(adapter, &args, 0);
+               rte_eal_alarm_set(IAVF_ALARM_INTERVAL,
+                                 iavf_dev_alarm_handler, dev);
+       }
+
        if (err) {
                PMD_DRV_LOG(ERR, "fail to execute command OP_REQUEST_QUEUES");
                return err;
@@ -1672,7 +1763,7 @@ iavf_get_max_rss_queue_region(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       err = iavf_execute_vf_cmd(adapter, &args);
+       err = iavf_execute_vf_cmd(adapter, &args, 0);
        if (err) {
                PMD_DRV_LOG(ERR, "Failed to execute command of VIRTCHNL_OP_GET_MAX_RSS_QREGION");
                return err;
@@ -1685,3 +1776,32 @@ iavf_get_max_rss_queue_region(struct iavf_adapter *adapter)
 
        return 0;
 }
+
+
+
+int
+iavf_ipsec_crypto_request(struct iavf_adapter *adapter,
+               uint8_t *msg, size_t msg_len,
+               uint8_t *resp_msg, size_t resp_msg_len)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct iavf_cmd_info args;
+       int err;
+
+       args.ops = VIRTCHNL_OP_INLINE_IPSEC_CRYPTO;
+       args.in_args = msg;
+       args.in_args_size = msg_len;
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+
+       err = iavf_execute_vf_cmd(adapter, &args, 1);
+       if (err) {
+               PMD_DRV_LOG(ERR, "fail to execute command %s",
+                               "OP_INLINE_IPSEC_CRYPTO");
+               return err;
+       }
+
+       memcpy(resp_msg, args.out_buffer, resp_msg_len);
+
+       return 0;
+}