diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2008-08-25 15:22:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-25 15:22:46 -0700 |
| commit | 76b190c592d952b37227f057a14f39e316754156 (patch) | |
| tree | d5ec7a442d32cd217ab472421f5a5ee63a271290 /drivers | |
| parent | 7add905f93fa62d11d45fb1d2d05980661f2ccde (diff) | |
| download | kernel_samsung_aries-76b190c592d952b37227f057a14f39e316754156.zip kernel_samsung_aries-76b190c592d952b37227f057a14f39e316754156.tar.gz kernel_samsung_aries-76b190c592d952b37227f057a14f39e316754156.tar.bz2 | |
bnx2x: Minimize lock time
After iSCSI boot, the HW lock should only protect the flag so only the
first function will reset the chip and not then entire chip reset
process
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 2e207b8..9972d0c 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -6824,6 +6824,10 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp) */ bnx2x_acquire_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); val = REG_RD(bp, DORQ_REG_NORM_CID_OFST); + if (val == 0x7) + REG_WR(bp, DORQ_REG_NORM_CID_OFST, 0); + bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); + if (val == 0x7) { u32 reset_code = DRV_MSG_CODE_UNLOAD_REQ_WOL_DIS; /* save our func */ @@ -6901,7 +6905,6 @@ static void __devinit bnx2x_undi_unload(struct bnx2x *bp) (SHMEM_RD(bp, func_mb[bp->func].drv_mb_header) & DRV_MSG_SEQ_NUMBER_MASK); } - bnx2x_release_hw_lock(bp, HW_LOCK_RESOURCE_UNDI); } } |