mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
[BNX2]: Add missing wait in bnx2_init_5709_context().
For correctness, we need to wait for the MEM_INIT bit to be cleared in the BNX2_CTX_COMMAND register before proceeding. [Added return -EBUSY when the MEM_INIT bit doesn't clear, suggested by Jeff Garzik.] Signed-off-by: Michael Chan <mchan@broadcom.com> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7947b20eba
commit
641bdcd56c
1 changed files with 14 additions and 3 deletions
|
@ -1778,6 +1778,15 @@ bnx2_init_5709_context(struct bnx2 *bp)
|
|||
val = BNX2_CTX_COMMAND_ENABLED | BNX2_CTX_COMMAND_MEM_INIT | (1 << 12);
|
||||
val |= (BCM_PAGE_BITS - 8) << 16;
|
||||
REG_WR(bp, BNX2_CTX_COMMAND, val);
|
||||
for (i = 0; i < 10; i++) {
|
||||
val = REG_RD(bp, BNX2_CTX_COMMAND);
|
||||
if (!(val & BNX2_CTX_COMMAND_MEM_INIT))
|
||||
break;
|
||||
udelay(2);
|
||||
}
|
||||
if (val & BNX2_CTX_COMMAND_MEM_INIT)
|
||||
return -EBUSY;
|
||||
|
||||
for (i = 0; i < bp->ctx_pages; i++) {
|
||||
int j;
|
||||
|
||||
|
@ -3696,9 +3705,11 @@ bnx2_init_chip(struct bnx2 *bp)
|
|||
|
||||
/* Initialize context mapping and zero out the quick contexts. The
|
||||
* context block must have already been enabled. */
|
||||
if (CHIP_NUM(bp) == CHIP_NUM_5709)
|
||||
bnx2_init_5709_context(bp);
|
||||
else
|
||||
if (CHIP_NUM(bp) == CHIP_NUM_5709) {
|
||||
rc = bnx2_init_5709_context(bp);
|
||||
if (rc)
|
||||
return rc;
|
||||
} else
|
||||
bnx2_init_context(bp);
|
||||
|
||||
if ((rc = bnx2_init_cpus(bp)) != 0)
|
||||
|
|
Loading…
Reference in a new issue