ethdev: change queue release callback

[dpdk.git] / drivers / net / iavf / iavf_vchnl.c

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 7f86050..3275687 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -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>
@@ -181,7 +182,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 +208,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 +226,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);
 
@@ -1680,13 +1681,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);
+               rte_intr_enable(&pci_dev->intr_handle);
+       } else {
+               rte_eal_alarm_cancel(iavf_dev_alarm_handler, dev);
+               err = iavf_execute_vf_cmd(adapter, &args);
+               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;