diff options
| author | Dmitry Kravkov | 2011-08-09 05:09:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2011-08-11 16:14:53 +0200 |
| commit | 2031bd3a8adce1259756e7f142b230c010035995 (patch) | |
| tree | bb82abfcc1a2b692d912404407270fdf9abebbed /drivers/net | |
| parent | bnx2x: fix select_queue when FCoE is disabled (diff) | |
| download | kernel-qcow2-linux-2031bd3a8adce1259756e7f142b230c010035995.tar.gz kernel-qcow2-linux-2031bd3a8adce1259756e7f142b230c010035995.tar.xz kernel-qcow2-linux-2031bd3a8adce1259756e7f142b230c010035995.zip | |
bnx2x: prevent race between undi_unload and load flows
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 150709111548..1f5467f9548c 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -5798,6 +5798,12 @@ static int bnx2x_init_hw_common(struct bnx2x *bp) DP(BNX2X_MSG_MCP, "starting common init func %d\n", BP_ABS_FUNC(bp)); + /* + * take the UNDI lock to protect undi_unload flow from accessing + * registers while we're resetting the chip + */ + bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); + bnx2x_reset_common(bp); REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET, 0xffffffff); @@ -5808,6 +5814,8 @@ static int bnx2x_init_hw_common(struct bnx2x *bp) } REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET, val); + bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); + bnx2x_init_block(bp, BLOCK_MISC, PHASE_COMMON); if (!CHIP_IS_E1x(bp)) { |