mlxbf_gige: Fix intermittent no ip issue

Although the link is up, there is no ip assigned on setups with high background
traffic. Nothing is transmitted nor received. The RX error count keeps on
increasing. After several minutes, the RX error count stagnates and the
GigE interface finally gets an ip.

The issue is that mlxbf_gige_rx_init() is called before phy_start().
As soon as the RX DMA is enabled in mlxbf_gige_rx_init(), the RX CI reaches the max
of 128, and becomes equal to RX PI. RX CI doesn't decrease since the code hasn't
ran phy_start yet.
Bring the PHY up before starting the RX.

Fixes: f92e1869d74e ("Add Mellanox BlueField Gigabit Ethernet driver")
Reviewed-by: David Thompson <davthompson@nvidia.com>
Signed-off-by: Asmaa Mnebhi <asmaa@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index 954ba0826c610dd30c1b19d12ac8f40ff3afccaf..ac7f0128619cdcb0796af96962145a6cab55b1d7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -147,14 +147,14 @@ static int mlxbf_gige_open(struct net_device *netdev)
         */
        priv->valid_polarity = 0;
 
-       err = mlxbf_gige_rx_init(priv);
+       phy_start(phydev);
+
+       err = mlxbf_gige_tx_init(priv);
        if (err)
                goto free_irqs;
-       err = mlxbf_gige_tx_init(priv);
+       err = mlxbf_gige_rx_init(priv);
        if (err)
-               goto rx_deinit;
-
-       phy_start(phydev);
+               goto tx_deinit;
 
        netif_napi_add(netdev, &priv->napi, mlxbf_gige_poll);
        napi_enable(&priv->napi);
@@ -176,8 +176,8 @@ static int mlxbf_gige_open(struct net_device *netdev)
 
        return 0;
 
-rx_deinit:
-       mlxbf_gige_rx_deinit(priv);
+tx_deinit:
+       mlxbf_gige_tx_deinit(priv);
 
 free_irqs:
        mlxbf_gige_free_irqs(priv);

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c
index 227d01cace3f0d4cb7d7da0e6e2e9f2e42ad0962..6999843584934808dfc376c22e59274c0b0f15b8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c
@@ -142,6 +142,9 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv)
        writeq(MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS_EN,
               priv->base + MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS);
 
+       writeq(ilog2(priv->rx_q_entries),
+              priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2);
+
        /* Clear MLXBF_GIGE_INT_MASK 'receive pkt' bit to
         * indicate readiness to receive interrupts
         */
@@ -154,9 +157,6 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv)
        data |= MLXBF_GIGE_RX_DMA_EN;
        writeq(data, priv->base + MLXBF_GIGE_RX_DMA);
 
-       writeq(ilog2(priv->rx_q_entries),
-              priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2);
-
        return 0;
 
 free_wqe_and_skb: