ethdev: fix VLAN offloads set if no relative capabilities

[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 2f0f33a..67e6afc 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;
@@ -271,7 +268,7 @@ static void hinic_dev_interrupt_handler(void *param)
        struct rte_eth_dev *dev = param;
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
 
-       if (!hinic_test_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status)) {
+       if (!rte_bit_relaxed_get32(HINIC_DEV_INTR_EN, &nic_dev->dev_status)) {
                PMD_DRV_LOG(WARNING, "Device's interrupt is disabled, ignore interrupt event, dev_name: %s, port_id: %d",
                            nic_dev->proc_dev_name, dev->data->port_id);
                return;
@@ -1067,7 +1064,7 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
        if (dev->data->dev_conf.intr_conf.lsc != 0)
                (void)hinic_link_update(dev, 0);
 
-       hinic_set_bit(HINIC_DEV_START, &nic_dev->dev_status);
+       rte_bit_relaxed_set32(HINIC_DEV_START, &nic_dev->dev_status);
 
        return 0;
 
@@ -1192,7 +1189,8 @@ static void hinic_dev_stop(struct rte_eth_dev *dev)
        name = dev->data->name;
        port_id = dev->data->port_id;
 
-       if (!hinic_test_and_clear_bit(HINIC_DEV_START, &nic_dev->dev_status)) {
+       if (!rte_bit_relaxed_test_and_clear32(HINIC_DEV_START,
+                                             &nic_dev->dev_status)) {
                PMD_DRV_LOG(INFO, "Device %s already stopped", name);
                return;
        }
@@ -1237,7 +1235,7 @@ static void hinic_disable_interrupt(struct rte_eth_dev *dev)
        struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        int ret, retries = 0;
 
-       hinic_clear_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
+       rte_bit_relaxed_clear32(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
 
        /* disable msix interrupt in hardware */
        hinic_set_msix_state(nic_dev->hwdev, 0, HINIC_MSIX_DISABLE);
@@ -1270,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;
 }
 
 /**
@@ -1700,12 +1709,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;
 }
 
@@ -1730,14 +1733,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;
 }
 
 /**
@@ -2926,7 +2940,8 @@ static void hinic_dev_close(struct rte_eth_dev *dev)
 {
        struct hinic_nic_dev *nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
 
-       if (hinic_test_and_set_bit(HINIC_DEV_CLOSE, &nic_dev->dev_status)) {
+       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;
@@ -3126,7 +3141,9 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
                            eth_dev->data->name);
                goto enable_intr_fail;
        }
-       hinic_set_bit(HINIC_DEV_INTR_EN, &nic_dev->dev_status);
+       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;
@@ -3141,7 +3158,7 @@ static int hinic_func_init(struct rte_eth_dev *eth_dev)
        TAILQ_INIT(&nic_dev->filter_fdir_rule_list);
        TAILQ_INIT(&nic_dev->hinic_flow_list);
 
-       hinic_set_bit(HINIC_DEV_INIT, &nic_dev->dev_status);
+       rte_bit_relaxed_set32(HINIC_DEV_INIT, &nic_dev->dev_status);
        PMD_DRV_LOG(INFO, "Initialize %s in primary successfully",
                    eth_dev->data->name);
 
@@ -3197,11 +3214,13 @@ 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);
-       hinic_clear_bit(HINIC_DEV_INIT, &nic_dev->dev_status);
+       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);
 
        dev->dev_ops = NULL;
@@ -3248,10 +3267,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);