Skip to content

Commit

Permalink
bnx2x: Protecting the link change indication
Browse files Browse the repository at this point in the history
Without this lock, in some race conditions the driver missed link
change indication

Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eilon Greenstein authored and David S. Miller committed Jan 15, 2009
1 parent 3c96c68 commit a5e9a7c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/bnx2x_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2234,9 +2234,7 @@ static void bnx2x_link_attn(struct bnx2x *bp)
/* Make sure that we are synced with the current statistics */
bnx2x_stats_handle(bp, STATS_EVENT_STOP);

bnx2x_acquire_phy_lock(bp);
bnx2x_link_update(&bp->link_params, &bp->link_vars);
bnx2x_release_phy_lock(bp);

if (bp->link_vars.link_up) {

Expand Down Expand Up @@ -2485,6 +2483,8 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
if (asserted & ATTN_HARD_WIRED_MASK) {
if (asserted & ATTN_NIG_FOR_FUNC) {

bnx2x_acquire_phy_lock(bp);

/* save nig interrupt mask */
bp->nig_mask = REG_RD(bp, nig_int_mask_addr);
REG_WR(bp, nig_int_mask_addr, 0);
Expand Down Expand Up @@ -2540,8 +2540,10 @@ static void bnx2x_attn_int_asserted(struct bnx2x *bp, u32 asserted)
REG_WR(bp, hc_addr, asserted);

/* now set back the mask */
if (asserted & ATTN_NIG_FOR_FUNC)
if (asserted & ATTN_NIG_FOR_FUNC) {
REG_WR(bp, nig_int_mask_addr, bp->nig_mask);
bnx2x_release_phy_lock(bp);
}
}

static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn)
Expand Down

0 comments on commit a5e9a7c

Please sign in to comment.