bnx2x: Link fixes
cover bnx2x: Link fixes
Hi Dave,
The following patch series has two small link fixes. Please consider applying it to net.
Thanks,
Yaniv
PATCH 1/2 bnx2x: Fix intermittent long KR2 link up time
When a KR2 device is connected to a KR link-partner, sometimes it requires disabling KR2 for the link to come up. To get a KR2 link up later, in case no base pages are seen, the KR2 is restored. The problem was that some link partners cleared their advertised BP/NP after around two seconds, causing the driver to disable/enable KR2 link all the time.
The fix was to wait at least 5 seconds before checking KR2 recovery.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 11 +++++++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +11 -0
@@ -12527,6 +12527,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars) vars->flow_ctrl =BNX2X_FLOW_CTRL_NONE ; vars->mac_type =MAC_TYPE_NONE ; vars->phy_flags =0 ; + vars->check_kr2_recovery_cnt =0 ;/* Driver opens NIG-BRB filters */ bnx2x_set_rx_filter (params,1 );/* Check if link flap can be avoided */
@@ -13411,6 +13412,7 @@ static void bnx2x_disable_kr2(struct link_params *params, vars->link_attr_sync &= ~LINK_ATTR_SYNC_KR2_ENABLE ;bnx2x_update_link_attr (params, vars->link_attr_sync); + vars->check_kr2_recovery_cnt =CHECK_KR2_RECOVERY_CNT ;/* Restart AN on leading lane */ bnx2x_warpcore_restart_AN_KR (phy, params); }
@@ -13439,6 +13441,15 @@ static void bnx2x_check_kr2_wa(struct link_params *params,return ; } +/* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery +* since some switches tend to reinit the AN process and clear the +* advertised BP/NP after ~2 seconds causing the KR2 to be disabled +* and recovered many times +*/ +if (vars->check_kr2_recovery_cnt >0 ) { + vars->check_kr2_recovery_cnt--; +return ; + } lane =bnx2x_get_warpcore_lane (phy, params);CL22_WR_OVER_CL45 (bp, phy,MDIO_REG_BANK_AER_BLOCK ,MDIO_AER_BLOCK_AER_REG , lane);
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +2 -1
@@ -342,7 +342,8 @@ struct link_vars {u32 link_status;u32 eee_status;u8 fault_detected; -u8 rsrv1; +u8 check_kr2_recovery_cnt; +#define CHECK_KR2_RECOVERY_CNT 5u16 periodic_flags;#define PERIODIC_FLAGS_LINK_EVENT 0x0001
Signature · 1 line
1.7.7.1
PATCH 2/2 bnx2x: Fix SFP+ misconfiguration in iSCSI boot scenario
In reply to Yaniv RosnerFix 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.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 6 +++++- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 1 + 2 files changed, 6 insertions(+), 1 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +5 -1
@@ -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 );/*
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +1 -0
@@ -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; };
Signature · 1 line
1.7.7.1
David Miller
maintainerFrom: "Yaniv Rosner" <[email protected]>
Date: Fri, 8 Mar 2013 01:27:32 +0200
Quoted 2 lines
The following patch series has two small link fixes. Please consider applying it to net.
All applied, thanks.