ethdev: remove forcing stopped state upon close

[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 b2c8a51..daf8f33 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -1189,6 +1189,8 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
        name = dev->data->name;
        port_id = dev->data->port_id;
 
+       dev->data->dev_started = 0;
+
        if (!rte_bit_relaxed_test_and_clear32(HINIC_DEV_START,
                                              &nic_dev->dev_status)) {
                PMD_DRV_LOG(INFO, "Device %s already stopped", name);
@@ -2583,26 +2585,53 @@ static int hinic_set_default_dcb_feature(struct hinic_nic_dev *nic_dev)
                                        up_pgid, up_bw, up_strict);
 }
 
+static int hinic_pf_get_default_cos(struct hinic_hwdev *hwdev, u8 *cos_id)
+{
+       u8 default_cos = 0;
+       u8 valid_cos_bitmap;
+       u8 i;
+
+       valid_cos_bitmap = hwdev->cfg_mgmt->svc_cap.valid_cos_bitmap;
+       if (!valid_cos_bitmap) {
+               PMD_DRV_LOG(ERR, "PF has none cos to support\n");
+               return -EFAULT;
+       }
+
+       for (i = 0; i < NR_MAX_COS; i++) {
+               if (valid_cos_bitmap & BIT(i))
+                       default_cos = i; /* Find max cos id as default cos */
+       }
+
+       *cos_id = default_cos;
+
+       return 0;
+}
+
 static int hinic_init_default_cos(struct hinic_nic_dev *nic_dev)
 {
        u8 cos_id = 0;
        int err;
 
        if (!HINIC_IS_VF(nic_dev->hwdev)) {
-               nic_dev->default_cos =
-                               (hinic_global_func_id(nic_dev->hwdev) +
-                                               DEFAULT_BASE_COS) % NR_MAX_COS;
+               err = hinic_pf_get_default_cos(nic_dev->hwdev, &cos_id);
+               if (err) {
+                       PMD_DRV_LOG(ERR, "Get PF default cos failed, err: %d",
+                                   err);
+                       return HINIC_ERROR;
+               }
        } else {
                err = hinic_vf_get_default_cos(nic_dev->hwdev, &cos_id);
                if (err) {
                        PMD_DRV_LOG(ERR, "Get VF default cos failed, err: %d",
-                                       err);
+                                   err);
                        return HINIC_ERROR;
                }
-
-               nic_dev->default_cos = cos_id;
        }
 
+       nic_dev->default_cos = cos_id;
+
+       PMD_DRV_LOG(INFO, "Default cos %d", nic_dev->default_cos);
+
        return 0;
 }
 
@@ -2938,15 +2967,18 @@ static void hinic_nic_dev_destroy(struct rte_eth_dev *eth_dev)
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void hinic_dev_close(struct rte_eth_dev *dev)
+static int hinic_dev_close(struct rte_eth_dev *dev)
 {
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
 
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        if (rte_bit_relaxed_test_and_set32(HINIC_DEV_CLOSE,
                                           &nic_dev->dev_status)) {
                PMD_DRV_LOG(WARNING, "Device %s already closed",
                            dev->data->name);
-               return;
+               return 0;
        }
 
        /* stop device first */
@@ -2973,6 +3005,8 @@ static void hinic_dev_close(struct rte_eth_dev *dev)
 
        /* deinit nic hardware device */
        hinic_nic_dev_destroy(dev);
+
+       return 0;
 }
 
 static const struct eth_dev_ops hinic_pmd_ops = {
@@ -3100,12 +3134,6 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
                goto mc_addr_fail;
        }
 
-       /*
-        * Pass the information to the rte_eth_dev_close() that it should also
-        * release the private port resources.
-        */
-       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
-
        /* create hardware nic_device */
        rc = hinic_nic_dev_create(eth_dev);
        if (rc) {
@@ -3231,9 +3259,6 @@ static int hinic_dev_uninit(struct rte_eth_dev *dev)
 
        rte_free(nic_dev->mc_list);
 
-       rte_free(dev->data->mac_addrs);
-       dev->data->mac_addrs = NULL;
-
        return HINIC_OK;
 }