New upstream version 17.11.3

[deb_dpdk.git] / drivers / net / liquidio / lio_ethdev.c

diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c
index 4b18966..0ca491b 100644 (file)
--- a/drivers/net/liquidio/lio_ethdev.c
+++ b/drivers/net/liquidio/lio_ethdev.c
@@ -1479,6 +1479,11 @@ lio_dev_start(struct rte_eth_dev *eth_dev)
        /* Configure RSS if device configured with multiple RX queues. */
        lio_dev_mq_rx_configure(eth_dev);
 
+       /* Before update the link info,
+        * must set linfo.link.link_status64 to 0.
+        */
+       lio_dev->linfo.link.link_status64 = 0;
+
        /* start polling for lsc */
        ret = rte_eal_alarm_set(LIO_LSC_TIMEOUT,
                                lio_sync_link_state_check,
@@ -1636,6 +1641,11 @@ lio_dev_close(struct rte_eth_dev *eth_dev)
                rte_write32(pkt_count, droq->pkts_sent_reg);
        }
 
+       if (lio_dev->pci_dev->kdrv == RTE_KDRV_IGB_UIO) {
+               cn23xx_vf_ask_pf_to_do_flr(lio_dev);
+               rte_delay_ms(LIO_PCI_FLR_WAIT);
+       }
+
        /* lio_free_mbox */
        lio_dev->fn_list.free_mbox(lio_dev);
 
@@ -2009,6 +2019,13 @@ lio_first_time_init(struct lio_device *lio_dev,
        if (cn23xx_pfvf_handshake(lio_dev))
                goto error;
 
+       /* Request and wait for device reset. */
+       if (pdev->kdrv == RTE_KDRV_IGB_UIO) {
+               cn23xx_vf_ask_pf_to_do_flr(lio_dev);
+               /* FLR wait time doubled as a precaution. */
+               rte_delay_ms(LIO_PCI_FLR_WAIT * 2);
+       }
+
        if (cn23xx_vf_set_io_queues_off(lio_dev)) {
                lio_dev_err(lio_dev, "Setting io queues off failed\n");
                goto error;