Zhirun Yan
2018-12-10 16:04:46 UTC
if reset but not reinit adminq, some operations in i40evf_dev_close()
like i40evf_dev_promiscuous_disable() and
i40evf_dev_allmulticast_disable() will result in failures.
Fixes: cae18d2b0fb4 ("net/i40e: add workaround promiscuous disable")
Signed-off-by: Zhirun Yan <***@intel.com>
Signed-off-by: Haiyue Wang <***@intel.com>
---
drivers/net/i40e/i40e_ethdev_vf.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index ae55b9b18..a1f4a729f 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2245,6 +2245,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 i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
i40evf_dev_stop(dev);
i40e_dev_free_queues(dev);
@@ -2253,10 +2254,12 @@ i40evf_dev_close(struct rte_eth_dev *dev)
* it is a workaround solution when work with kernel driver
* and it is not the normal way
*/
- i40evf_dev_promiscuous_disable(dev);
- i40evf_dev_allmulticast_disable(dev);
+ if (!vf->vf_reset) {
+ i40evf_dev_promiscuous_disable(dev);
+ i40evf_dev_allmulticast_disable(dev);
+ i40evf_reset_vf(hw);
+ }
- i40evf_reset_vf(hw);
i40e_shutdown_adminq(hw);
i40evf_disable_irq0(hw);
rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
like i40evf_dev_promiscuous_disable() and
i40evf_dev_allmulticast_disable() will result in failures.
Fixes: cae18d2b0fb4 ("net/i40e: add workaround promiscuous disable")
Signed-off-by: Zhirun Yan <***@intel.com>
Signed-off-by: Haiyue Wang <***@intel.com>
---
drivers/net/i40e/i40e_ethdev_vf.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index ae55b9b18..a1f4a729f 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2245,6 +2245,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 i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
i40evf_dev_stop(dev);
i40e_dev_free_queues(dev);
@@ -2253,10 +2254,12 @@ i40evf_dev_close(struct rte_eth_dev *dev)
* it is a workaround solution when work with kernel driver
* and it is not the normal way
*/
- i40evf_dev_promiscuous_disable(dev);
- i40evf_dev_allmulticast_disable(dev);
+ if (!vf->vf_reset) {
+ i40evf_dev_promiscuous_disable(dev);
+ i40evf_dev_allmulticast_disable(dev);
+ i40evf_reset_vf(hw);
+ }
- i40evf_reset_vf(hw);
i40e_shutdown_adminq(hw);
i40evf_disable_irq0(hw);
rte_eal_alarm_cancel(i40evf_dev_alarm_handler, dev);
--
2.17.1
2.17.1