net/memif: relax load of ring head for M2S zc ring

[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 0c3e1c0..466c836 100644 (file)
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -78,9 +78,6 @@
 /* lro numer limit for one packet */
 #define HINIC_LRO_WQE_NUM_DEFAULT      8
 
-/* Driver-specific log messages type */
-int hinic_logtype;
-
 struct hinic_xstats_name_off {
        char name[RTE_ETH_XSTATS_NAME_SIZE];
        u32  offset;
@@ -1271,14 +1268,25 @@ static void hinic_disable_interrupt(struct rte_eth_dev *dev)
 
 static int hinic_set_dev_promiscuous(struct hinic_nic_dev *nic_dev, bool enable)
 {
-       u32 rx_mode_ctrl = nic_dev->rx_mode_status;
+       u32 rx_mode_ctrl;
+       int err;
+
+       err = hinic_mutex_lock(&nic_dev->rx_mode_mutex);
+       if (err)
+               return err;
+
+       rx_mode_ctrl = nic_dev->rx_mode_status;
 
        if (enable)
                rx_mode_ctrl |= HINIC_RX_MODE_PROMISC;
        else
                rx_mode_ctrl &= (~HINIC_RX_MODE_PROMISC);
 
-       return hinic_config_rx_mode(nic_dev, rx_mode_ctrl);
+       err = hinic_config_rx_mode(nic_dev, rx_mode_ctrl);
+
+       (void)hinic_mutex_unlock(&nic_dev->rx_mode_mutex);
+
+       return err;
 }
 
 /**
@@ -1312,6 +1320,8 @@ hinic_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                return err;
        }
 
+       dev->data->rx_mbuf_alloc_failed = 0;
+
        /* rx queue stats */
        q_num = (nic_dev->num_rq < RTE_ETHDEV_QUEUE_STAT_CNTRS) ?
                        nic_dev->num_rq : RTE_ETHDEV_QUEUE_STAT_CNTRS;
@@ -1701,12 +1711,6 @@ static int hinic_vlan_offload_set(struct rte_eth_dev *dev, int mask)
                          nic_dev->proc_dev_name, dev->data->port_id);
        }
 
-       if (mask & ETH_VLAN_EXTEND_MASK) {
-               PMD_DRV_LOG(ERR, "Don't support vlan qinq, device: %s, port_id: %d",
-                         nic_dev->proc_dev_name, dev->data->port_id);
-               return -ENOTSUP;
-       }
-
        return 0;
 }
 
@@ -1731,14 +1735,25 @@ static void hinic_remove_all_vlanid(struct rte_eth_dev *eth_dev)
 static int hinic_set_dev_allmulticast(struct hinic_nic_dev *nic_dev,
                                bool enable)
 {
-       u32 rx_mode_ctrl = nic_dev->rx_mode_status;
+       u32 rx_mode_ctrl;
+       int err;
+
+       err = hinic_mutex_lock(&nic_dev->rx_mode_mutex);
+       if (err)
+               return err;
+
+       rx_mode_ctrl = nic_dev->rx_mode_status;
 
        if (enable)
                rx_mode_ctrl |= HINIC_RX_MODE_MC_ALL;
        else
                rx_mode_ctrl &= (~HINIC_RX_MODE_MC_ALL);
 
-       return hinic_config_rx_mode(nic_dev, rx_mode_ctrl);
+       err = hinic_config_rx_mode(nic_dev, rx_mode_ctrl);
+
+       (void)hinic_mutex_unlock(&nic_dev->rx_mode_mutex);
+
+       return err;
 }
 
 /**
@@ -2568,26 +2583,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;
 }
 
@@ -2923,15 +2965,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 */
@@ -2958,6 +3003,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 = {
@@ -3085,12 +3132,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) {
@@ -3130,6 +3171,8 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
        }
        rte_bit_relaxed_set32(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
 
+       hinic_mutex_init(&nic_dev->rx_mode_mutex, NULL);
+
        /* initialize filter info */
        filter_info = &nic_dev->filter;
        tcam_info = &nic_dev->tcam;
@@ -3204,6 +3247,8 @@ static int hinic_dev_uninit(struct rte_eth_dev *dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
+       hinic_mutex_destroy(&nic_dev->rx_mode_mutex);
+
        hinic_dev_close(dev);
 
        dev->dev_ops = NULL;
@@ -3212,9 +3257,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;
 }
 
@@ -3250,10 +3292,4 @@ static struct rte_pci_driver rte_hinic_pmd = {
 
 RTE_PMD_REGISTER_PCI(net_hinic, rte_hinic_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_hinic, pci_id_hinic_map);
-
-RTE_INIT(hinic_init_log)
-{
-       hinic_logtype = rte_log_register("pmd.net.hinic");
-       if (hinic_logtype >= 0)
-               rte_log_set_level(hinic_logtype, RTE_LOG_INFO);
-}
+RTE_LOG_REGISTER(hinic_logtype, pmd.net.hinic, INFO);