bnx2x: Fix SFP+ misconfiguration in iSCSI boot scenario

Fix a problem in which iSCSI-boot installation fails when switching SFP+ boot
port and moving the SFP+ module prior to boot. The SFP+ insertion triggers an
interrupt which configures the SFP+ module wrongly before interface is loaded.

Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 1 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 00ac4932f4c4..77ebae0ac64a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -8647,7 +8647,9 @@ void bnx2x_handle_module_detect_int(struct link_params *params)
                                                 MDIO_WC_DEVAD,
                                                 MDIO_WC_REG_DIGITAL5_MISC6,
                                                 &rx_tx_in_reset);
-                                if (!rx_tx_in_reset) {
+                                if ((!rx_tx_in_reset) &&
+                                    (params->link_flags &
+                                     PHY_INITIALIZED)) {
                                         bnx2x_warpcore_reset_lane(bp, phy, 1);
                                         bnx2x_warpcore_config_sfi(phy, params);
                                         bnx2x_warpcore_reset_lane(bp, phy, 0);
@@ -12528,6 +12530,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars)
         vars->mac_type = MAC_TYPE_NONE;
         vars->phy_flags = 0;
         vars->check_kr2_recovery_cnt = 0;
+        params->link_flags = PHY_INITIALIZED;
         /* Driver opens NIG-BRB filters */
         bnx2x_set_rx_filter(params, 1);
         /* Check if link flap can be avoided */
@@ -12692,6 +12695,7 @@ int bnx2x_lfa_reset(struct link_params *params,
         struct bnx2x *bp = params->bp;
         vars->link_up = 0;
         vars->phy_flags = 0;
+        params->link_flags &= ~PHY_INITIALIZED;
         if (!params->lfa_base)
                 return bnx2x_link_reset(params, vars, 1);
         /*
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index f92fcf71be04..56c2aae4e2c8 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -309,6 +309,7 @@ struct link_params {
                                 req_flow_ctrl is set to AUTO */
         u16 link_flags;
 #define LINK_FLAGS_INT_DISABLED         (1<<0)
+#define PHY_INITIALIZED         (1<<1)
         u32 lfa_base;
 };