diff --git a/[refs] b/[refs] index 7557d27972f7..72b2af703133 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e54588161577435d64dfb5cfdf40a73a5705ea0 +refs/heads/master: 594a9dfae7113d9601b2c353754c40d0b7e00a03 diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 00918602ba88..854d80c330ec 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -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);