net/virtio-user: fix status management

[dpdk.git] / drivers / net / atlantic / atl_ethdev.c

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 5018529..d3b00ab 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -26,8 +26,8 @@ static void atl_dev_close(struct rte_eth_dev *dev);
 static int  atl_dev_reset(struct rte_eth_dev *dev);
 static int  atl_dev_promiscuous_enable(struct rte_eth_dev *dev);
 static int  atl_dev_promiscuous_disable(struct rte_eth_dev *dev);
-static void atl_dev_allmulticast_enable(struct rte_eth_dev *dev);
-static void atl_dev_allmulticast_disable(struct rte_eth_dev *dev);
+static int atl_dev_allmulticast_enable(struct rte_eth_dev *dev);
+static int atl_dev_allmulticast_disable(struct rte_eth_dev *dev);
 static int  atl_dev_link_update(struct rte_eth_dev *dev, int wait);
 
 static int atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
@@ -40,7 +40,7 @@ static int atl_dev_stats_get(struct rte_eth_dev *dev,
 static int atl_dev_xstats_get(struct rte_eth_dev *dev,
                              struct rte_eth_xstat *stats, unsigned int n);
 
-static void atl_dev_stats_reset(struct rte_eth_dev *dev);
+static int atl_dev_stats_reset(struct rte_eth_dev *dev);
 
 static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
                              size_t fw_size);
@@ -120,9 +120,6 @@ static int eth_atl_pci_remove(struct rte_pci_device *pci_dev);
 static int atl_dev_info_get(struct rte_eth_dev *dev,
                                struct rte_eth_dev_info *dev_info);
 
-int atl_logtype_init;
-int atl_logtype_driver;
-
 /*
  * The set of PCI devices this driver supports
  */
@@ -407,6 +404,8 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
 
        hw->aq_nic_cfg = &adapter->hw_cfg;
 
+       pthread_mutex_init(&hw->mbox_mutex, NULL);
+
        /* disable interrupt */
        atl_disable_intr(hw);
 
@@ -471,6 +470,8 @@ eth_atl_dev_uninit(struct rte_eth_dev *eth_dev)
        rte_free(eth_dev->data->mac_addrs);
        eth_dev->data->mac_addrs = NULL;
 
+       pthread_mutex_destroy(&hw->mbox_mutex);
+
        return 0;
 }
 
@@ -975,7 +976,7 @@ atl_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        return 0;
 }
 
-static void
+static int
 atl_dev_stats_reset(struct rte_eth_dev *dev)
 {
        struct atl_adapter *adapter = ATL_DEV_TO_ADAPTER(dev);
@@ -987,6 +988,28 @@ atl_dev_stats_reset(struct rte_eth_dev *dev)
        memset(&hw->curr_stats, 0, sizeof(hw->curr_stats));
 
        memset(&adapter->sw_stats, 0, sizeof(adapter->sw_stats));
+
+       return 0;
+}
+
+static int
+atl_dev_xstats_get_count(struct rte_eth_dev *dev)
+{
+       struct atl_adapter *adapter =
+               (struct atl_adapter *)dev->data->dev_private;
+
+       struct aq_hw_s *hw = &adapter->hw;
+       unsigned int i, count = 0;
+
+       for (i = 0; i < RTE_DIM(atl_xstats_tbl); i++) {
+               if (atl_xstats_tbl[i].type == XSTATS_TYPE_MACSEC &&
+                       ((hw->caps_lo & BIT(CAPS_LO_MACSEC)) == 0))
+                       continue;
+
+               count++;
+       }
+
+       return count;
 }
 
 static int
@@ -995,15 +1018,17 @@ atl_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
                         unsigned int size)
 {
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
-       if (!xstats_names)
-               return RTE_DIM(atl_xstats_tbl);
-
-       for (i = 0; i < size && i < RTE_DIM(atl_xstats_tbl); i++)
-               strlcpy(xstats_names[i].name, atl_xstats_tbl[i].name,
-                       RTE_ETH_XSTATS_NAME_SIZE);
+       if (xstats_names) {
+               for (i = 0; i < size && i < count; i++) {
+                       snprintf(xstats_names[i].name,
+                               RTE_ETH_XSTATS_NAME_SIZE, "%s",
+                               atl_xstats_tbl[i].name);
+               }
+       }
 
-       return i;
+       return count;
 }
 
 static int
@@ -1017,9 +1042,10 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
        struct macsec_msg_fw_response resp = { 0 };
        int err = -1;
        unsigned int i;
+       unsigned int count = atl_dev_xstats_get_count(dev);
 
        if (!stats)
-               return 0;
+               return count;
 
        if (hw->aq_fw_ops->send_macsec_req != NULL) {
                req.ingress_sa_index = 0xff;
@@ -1032,7 +1058,7 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                err = hw->aq_fw_ops->send_macsec_req(hw, &msg, &resp);
        }
 
-       for (i = 0; i < n && i < RTE_DIM(atl_xstats_tbl); i++) {
+       for (i = 0; i < n && i < count; i++) {
                stats[i].id = i;
 
                switch (atl_xstats_tbl[i].type) {
@@ -1041,14 +1067,15 @@ atl_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
                                         atl_xstats_tbl[i].offset);
                        break;
                case XSTATS_TYPE_MACSEC:
-                       if (err)
-                               goto done;
-                       stats[i].value = *(u64 *)((uint8_t *)&resp.stats +
-                                        atl_xstats_tbl[i].offset);
+                       if (!err) {
+                               stats[i].value =
+                                       *(u64 *)((uint8_t *)&resp.stats +
+                                       atl_xstats_tbl[i].offset);
+                       }
                        break;
                }
        }
-done:
+
        return i;
 }
 
@@ -1227,23 +1254,27 @@ atl_dev_promiscuous_disable(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 atl_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        hw_atl_rpfl2_accept_all_mc_packets_set(hw, true);
+
+       return 0;
 }
 
-static void
+static int
 atl_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (dev->data->promiscuous == 1)
-               return; /* must remain in all_multicast mode */
+               return 0; /* must remain in all_multicast mode */
 
        hw_atl_rpfl2_accept_all_mc_packets_set(hw, false);
+
+       return 0;
 }
 
 /**
@@ -1514,11 +1545,11 @@ atl_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 
        if (fc == AQ_NIC_FC_OFF)
                fc_conf->mode = RTE_FC_NONE;
-       else if (fc & (AQ_NIC_FC_RX | AQ_NIC_FC_TX))
+       else if ((fc & AQ_NIC_FC_RX) && (fc & AQ_NIC_FC_TX))
                fc_conf->mode = RTE_FC_FULL;
        else if (fc & AQ_NIC_FC_RX)
                fc_conf->mode = RTE_FC_RX_PAUSE;
-       else if (fc & AQ_NIC_FC_RX)
+       else if (fc & AQ_NIC_FC_TX)
                fc_conf->mode = RTE_FC_TX_PAUSE;
 
        return 0;
@@ -1895,13 +1926,5 @@ is_atlantic_supported(struct rte_eth_dev *dev)
 RTE_PMD_REGISTER_PCI(net_atlantic, rte_atl_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_atlantic, pci_id_atl_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_atlantic, "* igb_uio | uio_pci_generic");
-
-RTE_INIT(atl_init_log)
-{
-       atl_logtype_init = rte_log_register("pmd.net.atlantic.init");
-       if (atl_logtype_init >= 0)
-               rte_log_set_level(atl_logtype_init, RTE_LOG_NOTICE);
-       atl_logtype_driver = rte_log_register("pmd.net.atlantic.driver");
-       if (atl_logtype_driver >= 0)
-               rte_log_set_level(atl_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(atl_logtype_init, pmd.net.atlantic.init, NOTICE);
+RTE_LOG_REGISTER(atl_logtype_driver, pmd.net.atlantic.driver, NOTICE);