leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bnx2x: Keep only one HW path active

Browse Source 
Disable bmac access while working with emac and keep the single lane SerDes in
reset while working with 4 lanes XGXS

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>
This commit is contained in:
Eilon Greenstein 2009-08-12 08:23:51 +00:00 committed by David S. Miller
parent 54016b260e
commit 6f65497b56
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bnx2x_link.c
View File

@ -397,7 +397,8 @@ static u8 bnx2x_emac_enable(struct link_params *params,
/* enable access for bmac registers */ /* enable access for bmac registers */
REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1); REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x1);
} } else
REG_WR(bp, NIG_REG_BMAC0_REGS_OUT_EN + port*4, 0x0);
vars->mac_type = MAC_TYPE_EMAC; vars->mac_type = MAC_TYPE_EMAC;
return 0; return 0;
@ -1021,8 +1022,8 @@ static u8 bnx2x_reset_unicore(struct link_params *params)
MDIO_COMBO_IEEE0_MII_CONTROL, MDIO_COMBO_IEEE0_MII_CONTROL,
(mii_control | (mii_control |
MDIO_COMBO_IEEO_MII_CONTROL_RESET)); MDIO_COMBO_IEEO_MII_CONTROL_RESET));
if (params->switch_cfg == SWITCH_CFG_1G)
bnx2x_set_serdes_access(params); bnx2x_set_serdes_access(params);
/* wait for the reset to self clear */ /* wait for the reset to self clear */
for (i = 0; i < MDIO_ACCESS_TIMEOUT; i++) { for (i = 0; i < MDIO_ACCESS_TIMEOUT; i++) {