enic: Bug Fix: Handle surprise hardware removals

[linux-2.6-block.git] / drivers / net / enic / vnic_wq.c

diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
index 1378afbdfe67b150ee172f6216f4af13fbd5c2ae..3ab7fa5501cd60f9952becb671442533c1bd4f31 100644 (file)
--- a/drivers/net/enic/vnic_wq.c
+++ b/drivers/net/enic/vnic_wq.c
@@ -37,23 +37,23 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
        vdev = wq->vdev;
 
        for (i = 0; i < blks; i++) {
-               wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);
+               wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC);
                if (!wq->bufs[i]) {
-                       printk(KERN_ERR "Failed to alloc wq_bufs\n");
+                       pr_err("Failed to alloc wq_bufs\n");
                        return -ENOMEM;
                }
        }
 
        for (i = 0; i < blks; i++) {
                buf = wq->bufs[i];
-               for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES; j++) {
-                       buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES + j;
+               for (j = 0; j < VNIC_WQ_BUF_BLK_ENTRIES(count); j++) {
+                       buf->index = i * VNIC_WQ_BUF_BLK_ENTRIES(count) + j;
                        buf->desc = (u8 *)wq->ring.descs +
                                wq->ring.desc_size * buf->index;
                        if (buf->index + 1 == count) {
                                buf->next = wq->bufs[0];
                                break;
-                       } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES) {
+                       } else if (j + 1 == VNIC_WQ_BUF_BLK_ENTRIES(count)) {
                                buf->next = wq->bufs[i + 1];
                        } else {
                                buf->next = buf + 1;
@@ -94,7 +94,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
 
        wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
        if (!wq->ctrl) {
-               printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index);
+               pr_err("Failed to hook WQ[%d] resource\n", index);
                return -EINVAL;
        }
 
@@ -119,10 +119,11 @@ void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
        unsigned int error_interrupt_offset)
 {
        u64 paddr;
+       unsigned int count = wq->ring.desc_count;
 
        paddr = (u64)wq->ring.base_addr | VNIC_PADDR_TARGET;
        writeq(paddr, &wq->ctrl->ring_base);
-       iowrite32(wq->ring.desc_count, &wq->ctrl->ring_size);
+       iowrite32(count, &wq->ctrl->ring_size);
        iowrite32(fetch_index, &wq->ctrl->fetch_index);
        iowrite32(posted_index, &wq->ctrl->posted_index);
        iowrite32(cq_index, &wq->ctrl->cq_index);
@@ -131,8 +132,8 @@ void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
        iowrite32(0, &wq->ctrl->error_status);
 
        wq->to_use = wq->to_clean =
-               &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES]
-                       [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES];
+               &wq->bufs[fetch_index / VNIC_WQ_BUF_BLK_ENTRIES(count)]
+                       [fetch_index % VNIC_WQ_BUF_BLK_ENTRIES(count)];
 }
 
 void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
@@ -167,7 +168,7 @@ int vnic_wq_disable(struct vnic_wq *wq)
                udelay(10);
        }
 
-       printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index);
+       pr_err("Failed to disable WQ[%d]\n", wq->index);
 
        return -ETIMEDOUT;
 }
@@ -177,8 +178,6 @@ void vnic_wq_clean(struct vnic_wq *wq,
 {
        struct vnic_wq_buf *buf;
 
-       BUG_ON(ioread32(&wq->ctrl->enable));
-
        buf = wq->to_clean;
 
        while (vnic_wq_desc_used(wq) > 0) {