mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
cnic: Fix L2CTX_STATUSB_NUM offset in context memory.
The BNX2_L2CTX_STATUSB_NUM definition needs to be changed to match
the recent firmware update:
commit 078b073588
bnx2: Update firmware to 5.0.0.j3.
Without the fix, bnx2 can crash intermittently in bnx2_rx_int() when
iSCSI is enabled.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f568a926a3
commit
d0549382da
2 changed files with 9 additions and 6 deletions
|
@ -361,9 +361,12 @@ struct l2_fhdr {
|
|||
#define BNX2_L2CTX_CTX_TYPE_CTX_BD_CHN_TYPE_VALUE (1<<28)
|
||||
|
||||
#define BNX2_L2CTX_HOST_BDIDX 0x00000004
|
||||
#define BNX2_L2CTX_STATUSB_NUM_SHIFT 16
|
||||
#define BNX2_L2CTX_STATUSB_NUM(sb_id) \
|
||||
(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_STATUSB_NUM_SHIFT) : 0)
|
||||
#define BNX2_L2CTX_L5_STATUSB_NUM_SHIFT 16
|
||||
#define BNX2_L2CTX_L2_STATUSB_NUM_SHIFT 24
|
||||
#define BNX2_L2CTX_L5_STATUSB_NUM(sb_id) \
|
||||
(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L5_STATUSB_NUM_SHIFT) : 0)
|
||||
#define BNX2_L2CTX_L2_STATUSB_NUM(sb_id) \
|
||||
(((sb_id) > 0) ? (((sb_id) + 7) << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT) : 0)
|
||||
#define BNX2_L2CTX_HOST_BSEQ 0x00000008
|
||||
#define BNX2_L2CTX_NX_BSEQ 0x0000000c
|
||||
#define BNX2_L2CTX_NX_BDHADDR_HI 0x00000010
|
||||
|
|
|
@ -2264,9 +2264,9 @@ static void cnic_init_bnx2_rx_ring(struct cnic_dev *dev)
|
|||
cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_CTX_TYPE, val);
|
||||
|
||||
if (sb_id == 0)
|
||||
val = 2 << BNX2_L2CTX_STATUSB_NUM_SHIFT;
|
||||
val = 2 << BNX2_L2CTX_L2_STATUSB_NUM_SHIFT;
|
||||
else
|
||||
val = BNX2_L2CTX_STATUSB_NUM(sb_id);
|
||||
val = BNX2_L2CTX_L2_STATUSB_NUM(sb_id);
|
||||
cnic_ctx_wr(dev, cid_addr, BNX2_L2CTX_HOST_BDIDX, val);
|
||||
|
||||
rxbd = (struct rx_bd *) (cp->l2_ring + BCM_PAGE_SIZE);
|
||||
|
@ -2423,7 +2423,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
|
|||
cp->int_num = 0;
|
||||
if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {
|
||||
u32 sb_id = cp->status_blk_num;
|
||||
u32 sb = BNX2_L2CTX_STATUSB_NUM(sb_id);
|
||||
u32 sb = BNX2_L2CTX_L5_STATUSB_NUM(sb_id);
|
||||
|
||||
cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;
|
||||
cnic_ctx_wr(dev, cp->kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
|
||||
|
|
Loading…
Reference in a new issue