malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bnx2: Refine remote PHY locking.

Browse Source 
bnx2_set_remote_link() should be called under bp->phy_lock to protect
against concurrent polling and interrupt calls.  This change is needed
by the next patch which will add one initial poll of the remote PHY
link status.

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>
This commit is contained in:
Michael Chan 2008-05-02 16:56:16 -07:00 committed by David S. Miller
parent ae4f8fca40
commit 74ecc62d6e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/bnx2.c
View File

@ -1717,7 +1717,6 @@ bnx2_remote_phy_event(struct bnx2 *bp)
break; break;
} }
spin_lock(&bp->phy_lock);
bp->flow_ctrl = 0; bp->flow_ctrl = 0;
if ((bp->autoneg & (AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) != if ((bp->autoneg & (AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) !=
(AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) { (AUTONEG_SPEED | AUTONEG_FLOW_CTRL)) {
@ -1739,7 +1738,6 @@ bnx2_remote_phy_event(struct bnx2 *bp)
if (old_port != bp->phy_port) if (old_port != bp->phy_port)
bnx2_set_default_link(bp); bnx2_set_default_link(bp);
spin_unlock(&bp->phy_lock);
} }
if (bp->link_up != link_up) if (bp->link_up != link_up)
bnx2_report_link(bp); bnx2_report_link(bp);
@ -2447,14 +2445,15 @@ bnx2_phy_event_is_set(struct bnx2 *bp, struct bnx2_napi *bnapi, u32 event)
static void static void
bnx2_phy_int(struct bnx2 *bp, struct bnx2_napi *bnapi) bnx2_phy_int(struct bnx2 *bp, struct bnx2_napi *bnapi)
{ {
if (bnx2_phy_event_is_set(bp, bnapi, STATUS_ATTN_BITS_LINK_STATE)) { spin_lock(&bp->phy_lock);
spin_lock(&bp->phy_lock);
if (bnx2_phy_event_is_set(bp, bnapi, STATUS_ATTN_BITS_LINK_STATE))
bnx2_set_link(bp); bnx2_set_link(bp);
spin_unlock(&bp->phy_lock);
}
if (bnx2_phy_event_is_set(bp, bnapi, STATUS_ATTN_BITS_TIMER_ABORT)) if (bnx2_phy_event_is_set(bp, bnapi, STATUS_ATTN_BITS_TIMER_ABORT))
bnx2_set_remote_link(bp); bnx2_set_remote_link(bp);
spin_unlock(&bp->phy_lock);
} }
static inline u16 static inline u16