devargs: add common key definition

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

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index d688c31..4725381 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -366,7 +366,7 @@ iavf_init_rss(struct iavf_adapter *adapter)
        /* configure RSS key */
        if (!rss_conf->rss_key) {
                /* Calculate the default hash key */
-               for (i = 0; i <= vf->vf_res->rss_key_size; i++)
+               for (i = 0; i < vf->vf_res->rss_key_size; i++)
                        vf->rss_key[i] = (uint8_t)rte_rand();
        } else
                rte_memcpy(vf->rss_key, rss_conf->rss_key,
@@ -2356,7 +2356,15 @@ iavf_dev_close(struct rte_eth_dev *dev)
        rte_free(vf->aq_resp);
        vf->aq_resp = NULL;
 
-       vf->vf_reset = false;
+       /*
+        * If the VF is reset via VFLR, the device will be knocked out of bus
+        * master mode, and the driver will fail to recover from the reset. Fix
+        * this by enabling bus mastering after every reset. In a non-VFLR case,
+        * the bus master bit will not be disabled, and this call will have no
+        * effect.
+        */
+       if (vf->vf_reset && !rte_pci_set_bus_master(pci_dev, true))
+               vf->vf_reset = false;
 
        return ret;
 }
@@ -2440,7 +2448,6 @@ static int
 iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t device_id)
 {
        struct rte_kvargs *kvlist;
-       const char *key = "driver";
        int ret = 0;
 
        if (device_id != IAVF_DEV_ID_VF &&
@@ -2456,13 +2463,13 @@ iavf_drv_i40evf_selected(struct rte_devargs *devargs, uint16_t device_id)
        if (kvlist == NULL)
                return 0;
 
-       if (!rte_kvargs_count(kvlist, key))
+       if (!rte_kvargs_count(kvlist, RTE_DEVARGS_KEY_DRIVER))
                goto exit;
 
        /* i40evf driver selected when there's a key-value pair:
         * driver=i40evf
         */
-       if (rte_kvargs_process(kvlist, key,
+       if (rte_kvargs_process(kvlist, RTE_DEVARGS_KEY_DRIVER,
                               iavf_drv_i40evf_check_handler, NULL) < 0)
                goto exit;