Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64591
b: refs/heads/master
c: 594a9df
h: refs/heads/master
i:
  64589: e00493c
  64587: 14c3165
  64583: 79222b0
  64575: e74a23d
v: v3
  • Loading branch information
Michael Chan authored and David S. Miller committed Aug 28, 2007
1 parent f79add5 commit 54fb139
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e54588161577435d64dfb5cfdf40a73a5705ea0
refs/heads/master: 594a9dfae7113d9601b2c353754c40d0b7e00a03
4 changes: 4 additions & 0 deletions trunk/drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -3934,6 +3934,10 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
/* Chip reset. */
REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);

/* Reading back any register after chip reset will hang the
* bus on 5706 A0 and A1. The msleep below provides plenty
* of margin for write posting.
*/
if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
(CHIP_ID(bp) == CHIP_ID_5706_A1))
msleep(20);
Expand Down

0 comments on commit 54fb139

Please sign in to comment.