New upstream version 18.11.2

[deb_dpdk.git] / drivers / net / bnx2x / bnx2x_ethdev.c

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index cc7816d..c628cdc 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -107,14 +107,15 @@ bnx2x_link_update(struct rte_eth_dev *dev)
 }
 
 static void
-bnx2x_interrupt_action(struct rte_eth_dev *dev)
+bnx2x_interrupt_action(struct rte_eth_dev *dev, int intr_cxt)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
        uint32_t link_status;
 
-       bnx2x_intr_legacy(sc, 0);
+       bnx2x_intr_legacy(sc);
 
-       if (sc->periodic_flags & PERIODIC_GO)
+       if ((atomic_load_acq_long(&sc->periodic_flags) == PERIODIC_GO) &&
+           !intr_cxt)
                bnx2x_periodic_callout(sc);
        link_status = REG_RD(sc, sc->link_params.shmem_base +
                        offsetof(struct shmem_region,
@@ -131,9 +132,7 @@ bnx2x_interrupt_handler(void *param)
 
        PMD_DEBUG_PERIODIC_LOG(INFO, sc, "Interrupt handled");
 
-       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP);
-       bnx2x_interrupt_action(dev);
-       atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO);
+       bnx2x_interrupt_action(dev, 1);
        rte_intr_enable(&sc->pci_dev->intr_handle);
 }
 
@@ -144,7 +143,7 @@ static void bnx2x_periodic_start(void *param)
        int ret = 0;
 
        atomic_store_rel_long(&sc->periodic_flags, PERIODIC_GO);
-       bnx2x_interrupt_action(dev);
+       bnx2x_interrupt_action(dev, 0);
        if (IS_PF(sc)) {
                ret = rte_eal_alarm_set(BNX2X_SP_TIMER_PERIOD,
                                        bnx2x_periodic_start, (void *)dev);
@@ -164,6 +163,8 @@ void bnx2x_periodic_stop(void *param)
        atomic_store_rel_long(&sc->periodic_flags, PERIODIC_STOP);
 
        rte_eal_alarm_cancel(bnx2x_periodic_start, (void *)dev);
+
+       PMD_DRV_LOG(DEBUG, sc, "Periodic poll stopped");
 }
 
 /*
@@ -180,8 +181,10 @@ bnx2x_dev_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE(sc);
 
-       if (rxmode->offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
+       if (rxmode->offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) {
                sc->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len;
+               dev->data->mtu = sc->mtu;
+       }
 
        if (dev->data->nb_tx_queues > dev->data->nb_rx_queues) {
                PMD_DRV_LOG(ERR, sc, "The number of TX queues is greater than number of RX queues");
@@ -210,6 +213,7 @@ bnx2x_dev_configure(struct rte_eth_dev *dev)
                return -ENXIO;
        }
 
+       bnx2x_dev_rxtx_init_dummy(dev);
        return 0;
 }
 
@@ -222,8 +226,10 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE(sc);
 
        /* start the periodic callout */
-       if (sc->periodic_flags & PERIODIC_STOP)
+       if (atomic_load_acq_long(&sc->periodic_flags) == PERIODIC_STOP) {
                bnx2x_periodic_start(dev);
+               PMD_DRV_LOG(DEBUG, sc, "Periodic poll re-started");
+       }
 
        ret = bnx2x_init(sc);
        if (ret) {
@@ -239,11 +245,7 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
                        PMD_DRV_LOG(ERR, sc, "rte_intr_enable failed");
        }
 
-       ret = bnx2x_dev_rx_init(dev);
-       if (ret != 0) {
-               PMD_DRV_LOG(DEBUG, sc, "bnx2x_dev_rx_init returned error code");
-               return -3;
-       }
+       bnx2x_dev_rxtx_init(dev);
 
        bnx2x_print_device_info(sc);
 
@@ -258,6 +260,8 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE(sc);
 
+       bnx2x_dev_rxtx_init_dummy(dev);
+
        if (IS_PF(sc)) {
                rte_intr_disable(&sc->pci_dev->intr_handle);
                rte_intr_callback_unregister(&sc->pci_dev->intr_handle,