bnx2x: Adding FW mailbox mutex
DCC commands are not protected with the RTNL lock, so a mutex should be added Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f34d28ea01
commit
c4ff7cbf88
|
@ -1023,6 +1023,9 @@ struct bnx2x {
|
||||||
/* used to synchronize dmae accesses */
|
/* used to synchronize dmae accesses */
|
||||||
struct mutex dmae_mutex;
|
struct mutex dmae_mutex;
|
||||||
|
|
||||||
|
/* used to protect the FW mail box */
|
||||||
|
struct mutex fw_mb_mutex;
|
||||||
|
|
||||||
/* used to synchronize stats collecting */
|
/* used to synchronize stats collecting */
|
||||||
int stats_state;
|
int stats_state;
|
||||||
/* used by dmae command loader */
|
/* used by dmae command loader */
|
||||||
|
|
|
@ -2528,6 +2528,7 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
|
||||||
u32 cnt = 1;
|
u32 cnt = 1;
|
||||||
u8 delay = CHIP_REV_IS_SLOW(bp) ? 100 : 10;
|
u8 delay = CHIP_REV_IS_SLOW(bp) ? 100 : 10;
|
||||||
|
|
||||||
|
mutex_lock(&bp->fw_mb_mutex);
|
||||||
SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq));
|
SHMEM_WR(bp, func_mb[func].drv_mb_header, (command | seq));
|
||||||
DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq));
|
DP(BNX2X_MSG_MCP, "wrote command (%x) to FW MB\n", (command | seq));
|
||||||
|
|
||||||
|
@ -2537,8 +2538,8 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
|
||||||
|
|
||||||
rc = SHMEM_RD(bp, func_mb[func].fw_mb_header);
|
rc = SHMEM_RD(bp, func_mb[func].fw_mb_header);
|
||||||
|
|
||||||
/* Give the FW up to 2 second (200*10ms) */
|
/* Give the FW up to 5 second (500*10ms) */
|
||||||
} while ((seq != (rc & FW_MSG_SEQ_NUMBER_MASK)) && (cnt++ < 200));
|
} while ((seq != (rc & FW_MSG_SEQ_NUMBER_MASK)) && (cnt++ < 500));
|
||||||
|
|
||||||
DP(BNX2X_MSG_MCP, "[after %d ms] read (%x) seq is (%x) from FW MB\n",
|
DP(BNX2X_MSG_MCP, "[after %d ms] read (%x) seq is (%x) from FW MB\n",
|
||||||
cnt*delay, rc, seq);
|
cnt*delay, rc, seq);
|
||||||
|
@ -2552,6 +2553,7 @@ u32 bnx2x_fw_command(struct bnx2x *bp, u32 command)
|
||||||
bnx2x_fw_dump(bp);
|
bnx2x_fw_dump(bp);
|
||||||
rc = 0;
|
rc = 0;
|
||||||
}
|
}
|
||||||
|
mutex_unlock(&bp->fw_mb_mutex);
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -8956,6 +8958,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp)
|
||||||
smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */
|
smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */
|
||||||
|
|
||||||
mutex_init(&bp->port.phy_mutex);
|
mutex_init(&bp->port.phy_mutex);
|
||||||
|
mutex_init(&bp->fw_mb_mutex);
|
||||||
#ifdef BCM_CNIC
|
#ifdef BCM_CNIC
|
||||||
mutex_init(&bp->cnic_mutex);
|
mutex_init(&bp->cnic_mutex);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue