bnx2x: Link/LED fixes
cover bnx2x: Link/LED fixes
Hi Dave,
The following patch series describe couple of link fixes. Please consider applying it to net.
Thanks,
Yaniv
PATCH 1/3 bnx2x: Fix port identification for the 84834
Fix the "ethtool -p" for boards with BCM84834, by using LED4 of the PHY to toggle the link LED while keeping interrupt disabled to avoid NIG attentions, and at the end restore NIG to previous state.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 60 ++++++++++++++++++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 +- 2 files changed, 62 insertions(+), 1 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +60 -0
@@ -10422,6 +10422,28 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,MDIO_PMA_DEVAD ,MDIO_PMA_REG_8481_LED1_MASK , 0x0); +if (phy->type == +PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834 ) { +/* Disable MI_INT interrupt before setting LED4 +* source to constant off. +*/ +if (REG_RD (bp,NIG_REG_MASK_INTERRUPT_PORT0 + + params->port*4 ) & +NIG_MASK_MI_INT ) { + params->link_flags |= +LINK_FLAGS_INT_DISABLED ; + +bnx2x_bits_dis ( + bp, +NIG_REG_MASK_INTERRUPT_PORT0 + + params->port*4 , +NIG_MASK_MI_INT ); + } +bnx2x_cl45_write (bp, phy, +MDIO_PMA_DEVAD , +MDIO_PMA_REG_8481_SIGNAL_MASK , +0x0 ); + } }break ;case LED_MODE_ON :
@@ -10468,6 +10490,28 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,MDIO_PMA_DEVAD ,MDIO_PMA_REG_8481_LED1_MASK , 0x20); +if (phy->type == +PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834 ) { +/* Disable MI_INT interrupt before setting LED4 +* source to constant on. +*/ +if (REG_RD (bp,NIG_REG_MASK_INTERRUPT_PORT0 + + params->port*4 ) & +NIG_MASK_MI_INT ) { + params->link_flags |= +LINK_FLAGS_INT_DISABLED ; + +bnx2x_bits_dis ( + bp, +NIG_REG_MASK_INTERRUPT_PORT0 + + params->port*4 , +NIG_MASK_MI_INT ); + } +bnx2x_cl45_write (bp, phy, +MDIO_PMA_DEVAD , +MDIO_PMA_REG_8481_SIGNAL_MASK , +0x20 ); + } }break ;
@@ -10532,6 +10576,22 @@ static void bnx2x_848xx_set_link_led(struct bnx2x_phy *phy,MDIO_PMA_DEVAD ,MDIO_PMA_REG_8481_LINK_SIGNAL , val); +if (phy->type == +PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84834 ) { +/* Restore LED4 source to external link, +* and re-enable interrupts. +*/ +bnx2x_cl45_write (bp, phy, +MDIO_PMA_DEVAD , +MDIO_PMA_REG_8481_SIGNAL_MASK , +0x40 ); +if (params->link_flags & +LINK_FLAGS_INT_DISABLED ) { +bnx2x_link_int_enable (params); + params->link_flags &= + ~LINK_FLAGS_INT_DISABLED ; + } + } }break ; }
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h +2 -1
@@ -307,7 +307,8 @@ struct link_params {struct bnx2x *bp;u16 req_fc_auto_adv;/* Should be set to TX / BOTH when req_flow_ctrl is set to AUTO */ -u16 rsrv1; +u16 link_flags; +#define LINK_FLAGS_INT_DISABLED (1<<0)u32 lfa_base; };
Signature · 1 line
1.7.7.1
PATCH 2/3 bnx2x: Fix KR2 link
In reply to Yaniv RosnerFix KR2 link down problem after reboot when link speed is reconfigured via ethtool. Since 1G/10G support link speed were missing by default, 1G/10G link speed were not advertised.
--- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 ++++++ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +6 -0
@@ -281,6 +281,8 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) cmd->lp_advertising |= ADVERTISED_2500baseX_Full;if (status &LINK_STATUS_LINK_PARTNER_10GXFD_CAPABLE ) cmd->lp_advertising |= ADVERTISED_10000baseT_Full; +if (status &LINK_STATUS_LINK_PARTNER_20GXFD_CAPABLE ) + cmd->lp_advertising |= ADVERTISED_20000baseKR2_Full; } cmd->maxtxpkt =0 ;
@@ -463,6 +465,10 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) ADVERTISED_10000baseKR_Full)) bp->link_params.speed_cap_mask[cfg_idx] |=PORT_HW_CFG_SPEED_CAPABILITY_D0_10G ; + +if (cmd->advertising & ADVERTISED_20000baseKR2_Full) + bp->link_params.speed_cap_mask[cfg_idx] |= +PORT_HW_CFG_SPEED_CAPABILITY_D0_20G ; } }else {/* forced speed */ /* advertise the requested speed and duplex if supported */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +2 -0
@@ -11851,6 +11851,8 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port, phy->media_type =ETH_PHY_KR ; phy->flags |=FLAGS_WC_DUAL_MODE ; phy->supported &= (SUPPORTED_20000baseKR2_Full | + SUPPORTED_10000baseT_Full | + SUPPORTED_1000baseT_Full | SUPPORTED_Autoneg | SUPPORTED_FIBRE | SUPPORTED_Pause |
Signature · 1 line
1.7.7.1
David Miller
maintainerFrom: "Yaniv Rosner" <[email protected]>
Date: Thu, 28 Feb 2013 01:06:43 +0200
Quoted 3 lines
Hi Dave,
The following patch series describe couple of link fixes. Please consider applying it to net.
Where is patch #1?
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Wed, 27 Feb 2013 16:10:44 -0500 (EST)
Quoted 8 lines
From: "Yaniv Rosner" <[email protected]>
Date: Thu, 28 Feb 2013 01:06:43 +0200Quoted 3 lines
Hi Dave,
The following patch series describe couple of link fixes. Please consider applying it to net.Where is patch #1?
Nevermind it just showed up :)
PATCH 3/3 bnx2x: Fix KR2 work-around condition
In reply to Yaniv RosnerFix condition typo for running KR2 work-around though it doesn't have real effect since the typo bits matched by chance.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +1 -1
@@ -13499,7 +13499,7 @@ void bnx2x_period_func(struct link_params *params, struct link_vars *vars)struct bnx2x_phy *phy = ¶ms->phy[INT_PHY ];bnx2x_set_aer_mmd (params, phy);if ((phy->supported & SUPPORTED_20000baseKR2_Full) && - (phy->speed_cap_mask &SPEED_20000 )) + (phy->speed_cap_mask &PORT_HW_CFG_SPEED_CAPABILITY_D0_20G ))bnx2x_check_kr2_wa (params, vars, phy);bnx2x_check_over_curr (params, vars);if (vars->rx_tx_asic_rst)
Signature · 1 line
1.7.7.1
David Miller
maintainerFrom: "Yaniv Rosner" <[email protected]>
Date: Thu, 28 Feb 2013 01:06:43 +0200
Quoted 2 lines
The following patch series describe couple of link fixes. Please consider applying it to net.
All applied, thanks Yaniv.