net/ionic: preserve Rx mode across LIF stop/start

[dpdk.git] / drivers / net / hinic / hinic_pmd_ethdev.c

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index 5974368..6264235 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -939,13 +939,6 @@ static int hinic_dev_set_link_up(struct rte_eth_dev *dev)
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
        int ret;
 
-       ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, true);
-       if (ret) {
-               PMD_DRV_LOG(ERR, "Enable port tx xsfp failed, dev_name: %s, port_id: %d",
-                           nic_dev->proc_dev_name, dev->data->port_id);
-               return ret;
-       }
-
        /* link status follow phy port status, up will open pma */
        ret = hinic_set_port_enable(nic_dev->hwdev, true);
        if (ret)
@@ -969,13 +962,6 @@ static int hinic_dev_set_link_down(struct rte_eth_dev *dev)
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
        int ret;
 
-       ret = hinic_set_xsfp_tx_status(nic_dev->hwdev, false);
-       if (ret) {
-               PMD_DRV_LOG(ERR, "Disable port tx xsfp failed, dev_name: %s, port_id: %d",
-                           nic_dev->proc_dev_name, dev->data->port_id);
-               return ret;
-       }
-
        /* link status follow phy port status, up will close pma */
        ret = hinic_set_port_enable(nic_dev->hwdev, false);
        if (ret)
@@ -1268,6 +1254,8 @@ static void hinic_disable_interrupt(struct rte_eth_dev *dev)
        if (retries == HINIC_INTR_CB_UNREG_MAX_RETRIES)
                PMD_DRV_LOG(ERR, "Unregister intr callback failed after %d retries",
                            retries);
+
+       rte_bit_relaxed_clear32(HINIC_DEV_INIT, &nic_dev->dev_status);
 }
 
 static int hinic_set_dev_promiscuous(struct hinic_nic_dev *nic_dev, bool enable)
@@ -1540,6 +1528,9 @@ static void hinic_deinit_mac_addr(struct rte_eth_dev *eth_dev)
 
        /* delete multicast mac addrs */
        hinic_delete_mc_addr_list(nic_dev);
+
+       rte_free(nic_dev->mc_list);
+
 }
 
 static int hinic_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
@@ -3006,6 +2997,9 @@ static int hinic_dev_close(struct rte_eth_dev *dev)
        /* disable hardware and uio interrupt */
        hinic_disable_interrupt(dev);
 
+       /* destroy rx mode mutex */
+       hinic_mutex_destroy(&nic_dev->rx_mode_mutex);
+
        /* deinit nic hardware device */
        hinic_nic_dev_destroy(dev);
 
@@ -3108,6 +3102,8 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
                return 0;
        }
 
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
        nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(eth_dev);
        memset(nic_dev, 0, sizeof(*nic_dev));
 
@@ -3244,20 +3240,11 @@ static int hinic_dev_init(struct rte_eth_dev *eth_dev)
 
 static int hinic_dev_uninit(struct rte_eth_dev *dev)
 {
-       struct hinic_nic_dev *nic_dev;
-
-       nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
-       rte_bit_relaxed_clear32(HINIC_DEV_INIT, &nic_dev->dev_status);
-
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       hinic_mutex_destroy(&nic_dev->rx_mode_mutex);
-
        hinic_dev_close(dev);
 
-       rte_free(nic_dev->mc_list);
-
        return HINIC_OK;
 }