Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cnic: Further unify kcq handling code.

Browse source 
This eliminates some of the duplicate code for the various devices
that require the same basic kcq handling.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2010-06-24 14:58:41 +00:00 committed by David S. Miller
parent 644b9d4f8b
commit b177a5d5d8
1 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
drivers/net/cnic.c
View file

@ -2223,16 +2223,12 @@ static void cnic_chk_pkt_rings(struct cnic_local *cp)
clear_bit(CNIC_LCL_FL_L2_WAIT, &cp->cnic_local_flags); clear_bit(CNIC_LCL_FL_L2_WAIT, &cp->cnic_local_flags);
} }
static int cnic_service_bnx2(void *data, void *status_blk) static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)
{ {
struct cnic_dev *dev = data;
struct cnic_local *cp = dev->cnic_priv; struct cnic_local *cp = dev->cnic_priv;
u32 status_idx = *cp->kcq1.status_idx_ptr; u32 status_idx = (u16) *cp->kcq1.status_idx_ptr;
int kcqe_cnt; int kcqe_cnt;
if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
return status_idx;
cp->kwq_con_idx = *cp->kwq_con_idx_ptr; cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) { while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) {
@ -2242,7 +2238,7 @@ static int cnic_service_bnx2(void *data, void *status_blk)
/* Tell compiler that status_blk fields can change. */ /* Tell compiler that status_blk fields can change. */
barrier(); barrier();
if (status_idx != *cp->kcq1.status_idx_ptr) { if (status_idx != *cp->kcq1.status_idx_ptr) {
status_idx = *cp->kcq1.status_idx_ptr; status_idx = (u16) *cp->kcq1.status_idx_ptr;
cp->kwq_con_idx = *cp->kwq_con_idx_ptr; cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
} else } else
break; break;
@ -2251,37 +2247,29 @@ static int cnic_service_bnx2(void *data, void *status_blk)
CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx); CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx);
cnic_chk_pkt_rings(cp); cnic_chk_pkt_rings(cp);
return status_idx; return status_idx;
} }
static int cnic_service_bnx2(void *data, void *status_blk)
{
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)))
return status_idx;
return cnic_service_bnx2_queues(dev);
}
static void cnic_service_bnx2_msix(unsigned long data) static void cnic_service_bnx2_msix(unsigned long data)
{ {
struct cnic_dev *dev = (struct cnic_dev *) data; struct cnic_dev *dev = (struct cnic_dev *) data;
struct cnic_local *cp = dev->cnic_priv; struct cnic_local *cp = dev->cnic_priv;
struct status_block_msix *status_blk = cp->status_blk.bnx2;
u32 status_idx = *cp->kcq1.status_idx_ptr;
int kcqe_cnt;
cp->kwq_con_idx = status_blk->status_cmd_consumer_index; cp->last_status_idx = cnic_service_bnx2_queues(dev);
while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) {
service_kcqes(dev, kcqe_cnt);
/* Tell compiler that status_blk fields can change. */
barrier();
if (status_idx != *cp->kcq1.status_idx_ptr) {
status_idx = *cp->kcq1.status_idx_ptr;
cp->kwq_con_idx = status_blk->status_cmd_consumer_index;
} else
break;
}
CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx);
cnic_chk_pkt_rings(cp);
cp->last_status_idx = status_idx;
CNIC_WR(dev, BNX2_PCICFG_INT_ACK_CMD, cp->int_num | CNIC_WR(dev, BNX2_PCICFG_INT_ACK_CMD, cp->int_num |
BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx); BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx);
} }
@ -2338,27 +2326,35 @@ static void cnic_ack_bnx2x_msix(struct cnic_dev *dev)
IGU_INT_DISABLE, 0); IGU_INT_DISABLE, 0);
} }
static void cnic_service_bnx2x_bh(unsigned long data) static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)
{ {
struct cnic_dev *dev = (struct cnic_dev *) data; u32 last_status = *info->status_idx_ptr;
struct cnic_local *cp = dev->cnic_priv;
u32 status_idx = *cp->kcq1.status_idx_ptr;
int kcqe_cnt; int kcqe_cnt;
if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags))) while ((kcqe_cnt = cnic_get_kcqes(dev, info))) {
return;
while ((kcqe_cnt = cnic_get_kcqes(dev, &cp->kcq1))) {
service_kcqes(dev, kcqe_cnt); service_kcqes(dev, kcqe_cnt);
/* Tell compiler that sblk fields can change. */ /* Tell compiler that sblk fields can change. */
barrier(); barrier();
if (status_idx == *cp->kcq1.status_idx_ptr) if (last_status == *info->status_idx_ptr)
break; break;
status_idx = *cp->kcq1.status_idx_ptr; last_status = *info->status_idx_ptr;
} }
return last_status;
}
static void cnic_service_bnx2x_bh(unsigned long data)
{
struct cnic_dev *dev = (struct cnic_dev *) data;
struct cnic_local *cp = dev->cnic_priv;
u32 status_idx;
if (unlikely(!test_bit(CNIC_F_CNIC_UP, &dev->flags)))
return;
status_idx = cnic_service_bnx2x_kcq(dev, &cp->kcq1);
CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx + MAX_KCQ_IDX); CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx + MAX_KCQ_IDX);
cnic_ack_bnx2x_int(dev, cp->status_blk_num, CSTORM_ID, cnic_ack_bnx2x_int(dev, cp->status_blk_num, CSTORM_ID,
@ -3786,6 +3782,7 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev)
cp->kcq1.hw_prod_idx_ptr = cp->kcq1.hw_prod_idx_ptr =
(u16 *) &msblk->status_completion_producer_index; (u16 *) &msblk->status_completion_producer_index;
cp->kcq1.status_idx_ptr = (u16 *) &msblk->status_idx; cp->kcq1.status_idx_ptr = (u16 *) &msblk->status_idx;
cp->kwq_con_idx_ptr = (u16 *) &msblk->status_cmd_consumer_index;
cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT; cp->int_num = sb_id << BNX2_PCICFG_INT_ACK_CMD_INT_NUM_SHIFT;
cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb); cnic_ctx_wr(dev, kwq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);
cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb); cnic_ctx_wr(dev, kcq_cid_addr, L5_KRNLQ_HOST_QIDX, sb);