提交 eaaa6e9c 编写于 作者: M Michael Chan 提交者: David S. Miller

cnic: Check device state before reading the kcq pointer in IRQ

If the device is down, the kcq pointer may be NULL.
Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 4aacb7af
...@@ -2352,11 +2352,12 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev) ...@@ -2352,11 +2352,12 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
static int cnic_service_bnx2(void *data, void *status_blk) static int cnic_service_bnx2(void *data, void *status_blk)
{ {
struct cnic_dev *dev = data; struct cnic_dev *dev = data;
struct cnic_local *cp = dev->cnic_priv;
u32 status_idx = *cp->kcq1.status_idx_ptr;
if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags))) if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
return status_idx; struct status_block *sblk = status_blk;
return sblk->status_idx;
}
return cnic_service_bnx2_queues(dev); return cnic_service_bnx2_queues(dev);
} }
...@@ -2375,9 +2376,10 @@ static void cnic_service_bnx2_msix(unsigned long data) ...@@ -2375,9 +2376,10 @@ static void cnic_service_bnx2_msix(unsigned long data)
static void cnic_doirq(struct cnic_dev *dev) static void cnic_doirq(struct cnic_dev *dev)
{ {
struct cnic_local *cp = dev->cnic_priv; struct cnic_local *cp = dev->cnic_priv;
u16 prod = cp->kcq1.sw_prod_idx & MAX_KCQ_IDX;
if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) { if (likely(test_bit(CNIC_F_CNIC_UP, &dev->flags))) {
u16 prod = cp->kcq1.sw_prod_idx & MAX_KCQ_IDX;
prefetch(cp->status_blk.gen); prefetch(cp->status_blk.gen);
prefetch(&cp->kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]); prefetch(&cp->kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册