New upstream version 18.11-rc2

[deb_dpdk.git] / drivers / net / virtio / virtio_ethdev.c

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 10a7e3f..e1fe36a 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -588,6 +588,10 @@ virtio_dev_close(struct rte_eth_dev *dev)
 
        PMD_INIT_LOG(DEBUG, "virtio_dev_close");
 
+       if (!hw->opened)
+               return;
+       hw->opened = false;
+
        /* reset the NIC */
        if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                VTPCI_OPS(hw)->set_config_irq(hw, VIRTIO_MSI_NO_VECTOR);
@@ -1288,6 +1292,7 @@ virtio_interrupt_handler(void *param)
        struct rte_eth_dev *dev = param;
        struct virtio_hw *hw = dev->data->dev_private;
        uint8_t isr;
+       uint16_t status;
 
        /* Read interrupt status which clears interrupt */
        isr = vtpci_isr(hw);
@@ -1301,12 +1306,17 @@ virtio_interrupt_handler(void *param)
                        _rte_eth_dev_callback_process(dev,
                                                      RTE_ETH_EVENT_INTR_LSC,
                                                      NULL);
-       }
 
-       if (isr & VIRTIO_NET_S_ANNOUNCE) {
-               virtio_notify_peers(dev);
-               if (hw->cvq)
-                       virtio_ack_link_announce(dev);
+               if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) {
+                       vtpci_read_dev_config(hw,
+                               offsetof(struct virtio_net_config, status),
+                               &status, sizeof(status));
+                       if (status & VIRTIO_NET_S_ANNOUNCE) {
+                               virtio_notify_peers(dev);
+                               if (hw->cvq)
+                                       virtio_ack_link_announce(dev);
+                       }
+               }
        }
 }
 
@@ -1679,11 +1689,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
        if (ret < 0)
                goto out;
 
-       /* Setup interrupt callback  */
-       if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
-               rte_intr_callback_register(eth_dev->intr_handle,
-                       virtio_interrupt_handler, eth_dev);
-
        return 0;
 
 out:
@@ -1706,11 +1711,6 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
        eth_dev->tx_pkt_burst = NULL;
        eth_dev->rx_pkt_burst = NULL;
 
-       /* reset interrupt callback  */
-       if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
-               rte_intr_callback_unregister(eth_dev->intr_handle,
-                                               virtio_interrupt_handler,
-                                               eth_dev);
        if (eth_dev->device)
                rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
 
@@ -1928,6 +1928,8 @@ virtio_dev_configure(struct rte_eth_dev *dev)
                           DEV_RX_OFFLOAD_VLAN_STRIP))
                hw->use_simple_rx = 0;
 
+       hw->opened = true;
+
        return 0;
 }
 
@@ -1969,6 +1971,12 @@ virtio_dev_start(struct rte_eth_dev *dev)
            dev->data->dev_conf.intr_conf.rxq) {
                virtio_intr_disable(dev);
 
+               /* Setup interrupt callback  */
+               if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
+                       rte_intr_callback_register(dev->intr_handle,
+                                                  virtio_interrupt_handler,
+                                                  dev);
+
                if (virtio_intr_enable(dev) < 0) {
                        PMD_DRV_LOG(ERR, "interrupt enable failed");
                        return -EIO;
@@ -2012,7 +2020,7 @@ virtio_dev_start(struct rte_eth_dev *dev)
        }
 
        set_rxtx_funcs(dev);
-       hw->started = 1;
+       hw->started = true;
 
        /* Initialize Link state */
        virtio_dev_link_update(dev, 0);
@@ -2078,12 +2086,24 @@ virtio_dev_stop(struct rte_eth_dev *dev)
        PMD_INIT_LOG(DEBUG, "stop");
 
        rte_spinlock_lock(&hw->state_lock);
-       if (intr_conf->lsc || intr_conf->rxq)
+       if (!hw->started)
+               goto out_unlock;
+       hw->started = false;
+
+       if (intr_conf->lsc || intr_conf->rxq) {
                virtio_intr_disable(dev);
 
-       hw->started = 0;
+               /* Reset interrupt callback  */
+               if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) {
+                       rte_intr_callback_unregister(dev->intr_handle,
+                                                    virtio_interrupt_handler,
+                                                    dev);
+               }
+       }
+
        memset(&link, 0, sizeof(link));
        rte_eth_linkstatus_set(dev, &link);
+out_unlock:
        rte_spinlock_unlock(&hw->state_lock);
 }
 
@@ -2099,7 +2119,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
        link.link_speed  = ETH_SPEED_NUM_10G;
        link.link_autoneg = ETH_LINK_FIXED;
 
-       if (hw->started == 0) {
+       if (!hw->started) {
                link.link_status = ETH_LINK_DOWN;
        } else if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) {
                PMD_INIT_LOG(DEBUG, "Get link status from hw");