net/bnx2x: fix poll link status

The PMD has been modified to invoke the polling function in the link
management code which detects the peer speed/mode, configure the link
and update the status accordingly. This patch is the fix for the link
down issue seen when we do dev_stop() and dev_start() from an
application.

Fixes: 540a211084a7 ("bnx2x: driver core")
Cc: stable@dpdk.org
Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 6228744..9cb9f21 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -125,7 +125,6 @@ int bnx2x_nic_load(struct bnx2x_softc *sc);
 
 static int bnx2x_handle_sp_tq(struct bnx2x_softc *sc);
 static void bnx2x_handle_fp_tq(struct bnx2x_fastpath *fp, int scan_fp);
-static void bnx2x_periodic_stop(struct bnx2x_softc *sc);
 static void bnx2x_ack_sb(struct bnx2x_softc *sc, uint8_t igu_sb_id,
                         uint8_t storm, uint16_t index, uint8_t op,
                         uint8_t update);
@@ -1969,9 +1968,6 @@ bnx2x_nic_unload(struct bnx2x_softc *sc, uint32_t unload_mode, uint8_t keep_link
 
        PMD_DRV_LOG(DEBUG, "Starting NIC unload...");
 
-       /* stop the periodic callout */
-       bnx2x_periodic_stop(sc);
-
        /* mark driver as unloaded in shmem2 */
        if (IS_PF(sc) && SHMEM2_HAS(sc, drv_capabilities_flag)) {
                val = SHMEM2_RD(sc, drv_capabilities_flag[SC_FW_MB_IDX(sc)]);
@@ -6999,16 +6995,6 @@ void bnx2x_link_status_update(struct bnx2x_softc *sc)
        }
 }
 
-static void bnx2x_periodic_start(struct bnx2x_softc *sc)
-{
-       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO);
-}
-
-static void bnx2x_periodic_stop(struct bnx2x_softc *sc)
-{
-       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP);
-}
-
 static int bnx2x_initial_phy_init(struct bnx2x_softc *sc, int load_mode)
 {
        int rc, cfg_idx = bnx2x_get_link_cfg_idx(sc);
@@ -7043,10 +7029,6 @@ static int bnx2x_initial_phy_init(struct bnx2x_softc *sc, int load_mode)
                bnx2x_link_report(sc);
        }
 
-       if (!CHIP_REV_IS_SLOW(sc)) {
-               bnx2x_periodic_start(sc);
-       }
-
        sc->link_params.req_line_speed[cfg_idx] = req_line_speed;
        return rc;
 }

diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index 4150fd8..873b003 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -1930,6 +1930,7 @@ void bnx2x_link_status_update(struct bnx2x_softc *sc);
 int bnx2x_complete_sp(struct bnx2x_softc *sc);
 int bnx2x_set_storm_rx_mode(struct bnx2x_softc *sc);
 void bnx2x_periodic_callout(struct bnx2x_softc *sc);
+void bnx2x_periodic_stop(void *param);
 
 int bnx2x_vf_get_resources(struct bnx2x_softc *sc, uint8_t tx_count, uint8_t rx_count);
 void bnx2x_vf_close(struct bnx2x_softc *sc);

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 3a554b8..c32d1da 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -13,6 +13,7 @@
 
 #include <rte_dev.h>
 #include <rte_ethdev_pci.h>
+#include <rte_alarm.h>
 
 int bnx2x_logtype_init;
 int bnx2x_logtype_driver;
@@ -81,26 +82,31 @@ static const struct rte_bnx2x_xstats_name_off bnx2x_xstats_strings[] = {
                offsetof(struct bnx2x_eth_stats, pfc_frames_received_lo)}
 };
 
-static void
+static int
 bnx2x_link_update(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
+       struct rte_eth_link link;
 
        PMD_INIT_FUNC_TRACE();
+
        bnx2x_link_status_update(sc);
+       memset(&link, 0, sizeof(link));
        mb();
-       dev->data->dev_link.link_speed = sc->link_vars.line_speed;
+       link.link_speed = sc->link_vars.line_speed;
        switch (sc->link_vars.duplex) {
                case DUPLEX_FULL:
-                       dev->data->dev_link.link_duplex = ETH_LINK_FULL_DUPLEX;
+                       link.link_duplex = ETH_LINK_FULL_DUPLEX;
                        break;
                case DUPLEX_HALF:
-                       dev->data->dev_link.link_duplex = ETH_LINK_HALF_DUPLEX;
+                       link.link_duplex = ETH_LINK_HALF_DUPLEX;
                        break;
        }
-       dev->data->dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds &
+       link.link_autoneg = !(dev->data->dev_conf.link_speeds &
                        ETH_LINK_SPEED_FIXED);
-       dev->data->dev_link.link_status = sc->link_vars.link_up;
+       link.link_status = sc->link_vars.link_up;
+
+       return rte_eth_linkstatus_set(dev, &link);
 }
 
 static void
@@ -109,8 +115,6 @@ bnx2x_interrupt_action(struct rte_eth_dev *dev)
        struct bnx2x_softc *sc = dev->data->dev_private;
        uint32_t link_status;
 
-       PMD_DEBUG_PERIODIC_LOG(INFO, "Interrupt handled");
-
        bnx2x_intr_legacy(sc, 0);
 
        if (sc->periodic_flags & PERIODIC_GO)
@@ -128,10 +132,41 @@ bnx2x_interrupt_handler(void *param)
        struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
        struct bnx2x_softc *sc = dev->data->dev_private;
 
+       PMD_DEBUG_PERIODIC_LOG(INFO, "Interrupt handled");
+
        bnx2x_interrupt_action(dev);
        rte_intr_enable(&sc->pci_dev->intr_handle);
 }
 
+static void bnx2x_periodic_start(void *param)
+{
+       struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
+       struct bnx2x_softc *sc = dev->data->dev_private;
+       int ret = 0;
+
+       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO);
+       bnx2x_interrupt_action(dev);
+       if (IS_PF(sc)) {
+               ret = rte_eal_alarm_set(BNX2X_SP_TIMER_PERIOD,
+                                       bnx2x_periodic_start, (void *)dev);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Unable to start periodic"
+                                        " timer rc %d", ret);
+                       assert(false && "Unable to start periodic timer");
+               }
+       }
+}
+
+void bnx2x_periodic_stop(void *param)
+{
+       struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
+       struct bnx2x_softc *sc = dev->data->dev_private;
+
+       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP);
+
+       rte_eal_alarm_cancel(bnx2x_periodic_start, (void *)dev);
+}
+
 /*
  * Devops - helper functions can be called from user application
  */
@@ -187,6 +222,10 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
+       /* start the periodic callout */
+       if (sc->periodic_flags & PERIODIC_STOP)
+               bnx2x_periodic_start(dev);
+
        ret = bnx2x_init(sc);
        if (ret) {
                PMD_DRV_LOG(DEBUG, "bnx2x_init failed (%d)", ret);
@@ -227,6 +266,9 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
                                bnx2x_interrupt_handler, (void *)dev);
        }
 
+       /* stop the periodic callout */
+       bnx2x_periodic_stop(dev);
+
        ret = bnx2x_nic_unload(sc, UNLOAD_NORMAL, FALSE);
        if (ret) {
                PMD_DRV_LOG(DEBUG, "bnx2x_nic_unload failed (%d)", ret);
@@ -309,20 +351,16 @@ bnx2x_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete
 {
        PMD_INIT_FUNC_TRACE();
 
-       int old_link_status = dev->data->dev_link.link_status;
-
-       bnx2x_link_update(dev);
-
-       return old_link_status == dev->data->dev_link.link_status ? -1 : 0;
+       return bnx2x_link_update(dev);
 }
 
 static int
 bnx2xvf_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
 {
-       int old_link_status = dev->data->dev_link.link_status;
        struct bnx2x_softc *sc = dev->data->dev_private;
+       int ret = 0;
 
-       bnx2x_link_update(dev);
+       ret = bnx2x_link_update(dev);
 
        bnx2x_check_bull(sc);
        if (sc->old_bulletin.valid_bitmap & (1 << CHANNEL_DOWN)) {
@@ -331,7 +369,7 @@ bnx2xvf_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_comple
                dev->data->dev_link.link_status = ETH_LINK_DOWN;
        }
 
-       return old_link_status == dev->data->dev_link.link_status ? -1 : 0;
+       return ret;
 }
 
 static int
@@ -585,6 +623,17 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
                return ret;
        }
 
+       /* schedule periodic poll for slowpath link events */
+       if (IS_PF(sc)) {
+               ret = rte_eal_alarm_set(BNX2X_SP_TIMER_PERIOD,
+                                       bnx2x_periodic_start, (void *)eth_dev);
+               if (ret) {
+                       PMD_DRV_LOG(ERR, "Unable to start periodic"
+                                         " timer rc %d", ret);
+                       return -EINVAL;
+               }
+       }
+
        eth_dev->data->mac_addrs = (struct ether_addr *)sc->link_params.mac_addr;
 
        PMD_DRV_LOG(INFO, "pcie_bus=%d, pcie_device=%d",
@@ -599,18 +648,20 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
        if (IS_VF(sc)) {
                rte_spinlock_init(&sc->vf2pf_lock);
 
-               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg),
-                                   &sc->vf2pf_mbox_mapping, "vf2pf_mbox",
-                                   RTE_CACHE_LINE_SIZE) != 0)
-                       return -ENOMEM;
+               ret = bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg),
+                                     &sc->vf2pf_mbox_mapping, "vf2pf_mbox",
+                                     RTE_CACHE_LINE_SIZE);
+               if (ret)
+                       goto out;
 
                sc->vf2pf_mbox = (struct bnx2x_vf_mbx_msg *)
                                         sc->vf2pf_mbox_mapping.vaddr;
 
-               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin),
-                                   &sc->pf2vf_bulletin_mapping, "vf2pf_bull",
-                                   RTE_CACHE_LINE_SIZE) != 0)
-                       return -ENOMEM;
+               ret = bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin),
+                                     &sc->pf2vf_bulletin_mapping, "vf2pf_bull",
+                                     RTE_CACHE_LINE_SIZE);
+               if (ret)
+                       goto out;
 
                sc->pf2vf_bulletin = (struct bnx2x_vf_bulletin *)
                                             sc->pf2vf_bulletin_mapping.vaddr;
@@ -618,10 +669,14 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
                ret = bnx2x_vf_get_resources(sc, sc->max_tx_queues,
                                             sc->max_rx_queues);
                if (ret)
-                       return ret;
+                       goto out;
        }
 
        return 0;
+
+out:
+       bnx2x_periodic_stop(eth_dev);
+       return ret;
 }
 
 static int

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.h b/drivers/net/bnx2x/bnx2x_ethdev.h
index f05be7e..5f9169d 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.h
+++ b/drivers/net/bnx2x/bnx2x_ethdev.h
@@ -58,7 +58,6 @@
 #define wmb()   rte_wmb()
 #define rmb()   rte_rmb()
 
-
 #define MAX_QUEUES sysconf(_SC_NPROCESSORS_CONF)
 
 #define BNX2X_MIN_RX_BUF_SIZE 1024
@@ -72,6 +71,8 @@
 /* Maximum number of Rx packets to process at a time */
 #define BNX2X_RX_BUDGET 0xffffffff
 
+#define BNX2X_SP_TIMER_PERIOD US_PER_S /* 1 second */
+
 #endif
 
 /* MAC address operations */