70 lines
2.0 KiB
Diff
70 lines
2.0 KiB
Diff
|
From 9a0615af7746485d73d10561cc0743bc2fcd4bf7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jianfeng Tan <jianfeng.tan@intel.com>
|
||
|
|
Date: Mon, 11 Jan 2016 14:16:13 +0800
|
||
|
|
Subject: [PATCH] virtio: fix restart
|
||
|
|
|
||
|
|
Fix the issue that virtio device cannot be started after stopped.
|
||
|
|
|
||
|
|
The field, hw->started, should be changed by virtio_dev_start/stop instead
|
||
|
|
of virtio_dev_close.
|
||
|
|
|
||
|
|
Fixes: a85786dc816f ("virtio: fix states handling during initialization")
|
||
|
|
|
||
|
|
Reported-by: Pavel Fedin <p.fedin@samsung.com>
|
||
|
|
Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
|
||
|
|
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
|
||
|
|
Tested-by: Pavel Fedin <p.fedin@samsung.com>
|
||
|
|
---
|
||
|
|
drivers/net/virtio/virtio_ethdev.c | 14 +++++++++-----
|
||
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
|
||
|
|
index 06bddd7..ec18fd0 100644
|
||
|
|
--- a/drivers/net/virtio/virtio_ethdev.c
|
||
|
|
+++ b/drivers/net/virtio/virtio_ethdev.c
|
||
|
|
@@ -478,11 +478,13 @@ virtio_dev_close(struct rte_eth_dev *dev)
|
||
|
|
|
||
|
|
PMD_INIT_LOG(DEBUG, "virtio_dev_close");
|
||
|
|
|
||
|
|
+ if (hw->started == 1)
|
||
|
|
+ virtio_dev_stop(dev);
|
||
|
|
+
|
||
|
|
/* reset the NIC */
|
||
|
|
if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
|
||
|
|
vtpci_irq_config(hw, VIRTIO_MSI_NO_VECTOR);
|
||
|
|
vtpci_reset(hw);
|
||
|
|
- hw->started = 0;
|
||
|
|
virtio_dev_free_mbufs(dev);
|
||
|
|
virtio_free_queues(dev);
|
||
|
|
}
|
||
|
|
@@ -1159,10 +1161,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
|
||
|
|
if (rte_eal_process_type() == RTE_PROC_SECONDARY)
|
||
|
|
return -EPERM;
|
||
|
|
|
||
|
|
- if (hw->started == 1) {
|
||
|
|
- virtio_dev_stop(eth_dev);
|
||
|
|
- virtio_dev_close(eth_dev);
|
||
|
|
- }
|
||
|
|
+ /* Close it anyway since there's no way to know if closed */
|
||
|
|
+ virtio_dev_close(eth_dev);
|
||
|
|
+
|
||
|
|
pci_dev = eth_dev->pci_dev;
|
||
|
|
|
||
|
|
eth_dev->dev_ops = NULL;
|
||
|
|
@@ -1364,9 +1365,12 @@ static void
|
||
|
|
virtio_dev_stop(struct rte_eth_dev *dev)
|
||
|
|
{
|
||
|
|
struct rte_eth_link link;
|
||
|
|
+ struct virtio_hw *hw = dev->data->dev_private;
|
||
|
|
|
||
|
|
PMD_INIT_LOG(DEBUG, "stop");
|
||
|
|
|
||
|
|
+ hw->started = 0;
|
||
|
|
+
|
||
|
|
if (dev->data->dev_conf.intr_conf.lsc)
|
||
|
|
rte_intr_disable(&dev->pci_dev->intr_handle);
|
||
|
|
|
||
|
|
--
|
||
|
|
2.6.2
|
||
|
|
|