nfp: serialize access for hardware reconfiguration

[dpdk.git] / drivers / net / nfp / nfp_net.c

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 201c38e..559ebe6 100644 (file)
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -54,6 +54,7 @@
 #include <rte_version.h>
 #include <rte_string_fns.h>
 #include <rte_alarm.h>
+#include <rte_spinlock.h>
 
 #include "nfp_net_pmd.h"
 #include "nfp_net_logs.h"
@@ -407,6 +408,8 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update)
        PMD_DRV_LOG(DEBUG, "nfp_net_reconfig: ctrl=%08x update=%08x\n",
                    ctrl, update);
 
+       rte_spinlock_lock(&hw->reconfig_lock);
+
        nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl);
        nn_cfg_writel(hw, NFP_NET_CFG_UPDATE, update);
 
@@ -414,6 +417,8 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update)
 
        err = __nfp_net_reconfig(hw, update);
 
+       rte_spinlock_unlock(&hw->reconfig_lock);
+
        if (!err)
                return 0;
 
@@ -902,11 +907,6 @@ nfp_net_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
        nfp_dev_stats.obytes -= hw->eth_stats_base.obytes;
 
-       nfp_dev_stats.imcasts =
-               nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_MC_FRAMES);
-
-       nfp_dev_stats.imcasts -= hw->eth_stats_base.imcasts;
-
        /* reading general device stats */
        nfp_dev_stats.ierrors =
                nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_ERRORS);
@@ -918,12 +918,6 @@ nfp_net_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 
        nfp_dev_stats.oerrors -= hw->eth_stats_base.oerrors;
 
-       /* Multicast frames received */
-       nfp_dev_stats.imcasts =
-               nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_MC_FRAMES);
-
-       nfp_dev_stats.imcasts -= hw->eth_stats_base.imcasts;
-
        /* RX ring mbuf allocation failures */
        nfp_dev_stats.rx_nombuf = dev->data->rx_mbuf_alloc_failed;
 
@@ -985,9 +979,6 @@ nfp_net_stats_reset(struct rte_eth_dev *dev)
        hw->eth_stats_base.obytes =
                nn_cfg_readq(hw, NFP_NET_CFG_STATS_TX_OCTETS);
 
-       hw->eth_stats_base.imcasts =
-               nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_MC_FRAMES);
-
        /* reading general device stats */
        hw->eth_stats_base.ierrors =
                nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_ERRORS);
@@ -995,10 +986,6 @@ nfp_net_stats_reset(struct rte_eth_dev *dev)
        hw->eth_stats_base.oerrors =
                nn_cfg_readq(hw, NFP_NET_CFG_STATS_TX_ERRORS);
 
-       /* Multicast frames received */
-       hw->eth_stats_base.imcasts =
-               nn_cfg_readq(hw, NFP_NET_CFG_STATS_RX_MC_FRAMES);
-
        /* RX ring mbuf allocation failures */
        dev->data->rx_mbuf_alloc_failed = 0;
 
@@ -1061,6 +1048,8 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ;
        dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ;
+
+       dev_info->speed_capa = ETH_LINK_SPEED_40G | ETH_LINK_SPEED_100G;
 }
 
 static const uint32_t *
@@ -2415,6 +2404,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u\n",
                     hw->max_rx_queues, hw->max_tx_queues);
 
+       /* Initializing spinlock for reconfigs */
+       rte_spinlock_init(&hw->reconfig_lock);
+
        /* Allocating memory for mac addr */
        eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", ETHER_ADDR_LEN, 0);
        if (eth_dev->data->mac_addrs == NULL) {