Skip to content

Commit

Permalink
cnic: Fix interrupt logic
Browse files Browse the repository at this point in the history
We need to keep looping until cnic_get_kcqes() returns 0.  cnic_get_kcqes()
returns a maximum of 64 entries.  If there are more entries in the queue
and we don't loop back, the remaining entries may not be serviced for a
long time.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Jun 9, 2011
1 parent 2b77bdd commit 9373665
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/net/cnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -2778,13 +2778,10 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev)

/* Tell compiler that status_blk fields can change. */
barrier();
if (status_idx != *cp->kcq1.status_idx_ptr) {
status_idx = (u16) *cp->kcq1.status_idx_ptr;
/* status block index must be read first */
rmb();
cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
} else
break;
status_idx = (u16) *cp->kcq1.status_idx_ptr;
/* status block index must be read first */
rmb();
cp->kwq_con_idx = *cp->kwq_con_idx_ptr;
}

CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx);
Expand Down Expand Up @@ -2908,8 +2905,6 @@ static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)

/* Tell compiler that sblk fields can change. */
barrier();
if (last_status == *info->status_idx_ptr)
break;

last_status = *info->status_idx_ptr;
/* status block index must be read before reading the KCQ */
Expand Down

0 comments on commit 9373665

Please sign in to comment.