aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2008-05-02 19:56:44 -0400
committerDavid S. Miller <davem@davemloft.net>2008-05-02 19:56:44 -0400
commit543a827d7a5600a71855bd6afacac78536c86822 (patch)
tree74a308cd8a4d7d4dbdba8b60e0230cfeddb69032 /drivers/net/bnx2.c
parent74ecc62d6e595ca64bbef2471787bf53b94e5d3c (diff)
bnx2: Fix remote PHY initial link state.
On some remote PHY blade systems, the driver receives no initial link interrupt. As a result, the GMII/MII MAC mode does not get setup properly. To fix this problem, we add an initial poll of the link state after chip reset. With this change, the setting of the initial carrier state in the init code can be eliminated. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 506c5ccd7156..d681f3153e7c 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -4216,13 +4216,6 @@ bnx2_init_remote_phy(struct bnx2 *bp)
4216 if (netif_running(bp->dev)) { 4216 if (netif_running(bp->dev)) {
4217 u32 sig; 4217 u32 sig;
4218 4218
4219 if (val & BNX2_LINK_STATUS_LINK_UP) {
4220 bp->link_up = 1;
4221 netif_carrier_on(bp->dev);
4222 } else {
4223 bp->link_up = 0;
4224 netif_carrier_off(bp->dev);
4225 }
4226 sig = BNX2_DRV_ACK_CAP_SIGNATURE | 4219 sig = BNX2_DRV_ACK_CAP_SIGNATURE |
4227 BNX2_FW_CAP_REMOTE_PHY_CAPABLE; 4220 BNX2_FW_CAP_REMOTE_PHY_CAPABLE;
4228 bnx2_shmem_wr(bp, BNX2_DRV_ACK_CAP_MB, sig); 4221 bnx2_shmem_wr(bp, BNX2_DRV_ACK_CAP_MB, sig);
@@ -4879,6 +4872,8 @@ bnx2_init_nic(struct bnx2 *bp)
4879 spin_lock_bh(&bp->phy_lock); 4872 spin_lock_bh(&bp->phy_lock);
4880 bnx2_init_phy(bp); 4873 bnx2_init_phy(bp);
4881 bnx2_set_link(bp); 4874 bnx2_set_link(bp);
4875 if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP)
4876 bnx2_remote_phy_event(bp);
4882 spin_unlock_bh(&bp->phy_lock); 4877 spin_unlock_bh(&bp->phy_lock);
4883 return 0; 4878 return 0;
4884} 4879}