diff options
author | Eilon Greenstein <eilong@broadcom.com> | 2009-02-12 09:37:04 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-16 08:31:33 +0100 |
commit | 811a2f2d3be9a39bd4e0930501fda8630857748d (patch) | |
tree | ab00cd6bcc94c0cc270a747288d311b612077a87 /drivers/net/bnx2x_link.c | |
parent | bnx2x: Saving PHY FW version (diff) | |
download | linux-811a2f2d3be9a39bd4e0930501fda8630857748d.tar.xz linux-811a2f2d3be9a39bd4e0930501fda8630857748d.zip |
bnx2x: EMAC reset
The NIG_ENABLE does not reset the emac. Replace it with explicit reset
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>
Diffstat (limited to 'drivers/net/bnx2x_link.c')
-rw-r--r-- | drivers/net/bnx2x_link.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c index ffa412f63c96..f4c699ecfb41 100644 --- a/drivers/net/bnx2x_link.c +++ b/drivers/net/bnx2x_link.c @@ -297,8 +297,10 @@ static u8 bnx2x_emac_enable(struct link_params *params, port*4, 0); } - /* enable emac */ - REG_WR(bp, NIG_REG_NIG_EMAC0_EN + port*4, 1); + bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_RX_MODE, + EMAC_RX_MODE_RESET); + bnx2x_bits_en(bp, emac_base + EMAC_REG_EMAC_TX_MODE, + EMAC_TX_MODE_RESET); if (CHIP_REV_IS_SLOW(bp)) { /* config GMII mode */ |