4 files changed, 37 insertions, 26 deletions

diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c
index 6d84ca840052..45cfc79f9f98 100644
--- a/drivers/net/enic/vnic_rq.c
+++ b/drivers/net/enic/vnic_rq.c
@@ -37,7 +37,7 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
         vdev = rq->vdev;
 
         for (i = 0; i < blks; i++) {
-                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
+                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC);
                 if (!rq->bufs[i]) {
                         pr_err("Failed to alloc rq_bufs\n");
                         return -ENOMEM;
@@ -46,14 +46,14 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
 
         for (i = 0; i < blks; i++) {
                 buf = rq->bufs[i];
-                for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES; j++) {
-                        buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES + j;
+                for (j = 0; j < VNIC_RQ_BUF_BLK_ENTRIES(count); j++) {
+                        buf->index = i * VNIC_RQ_BUF_BLK_ENTRIES(count) + j;
                         buf->desc = (u8 *)rq->ring.descs +
                                 rq->ring.desc_size * buf->index;
                         if (buf->index + 1 == count) {
                                 buf->next = rq->bufs[0];
                                 break;
-                        } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES) {
+                        } else if (j + 1 == VNIC_RQ_BUF_BLK_ENTRIES(count)) {
                                 buf->next = rq->bufs[i + 1];
                         } else {
                                 buf->next = buf + 1;
@@ -119,10 +119,11 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
         unsigned int error_interrupt_offset)
 {
         u64 paddr;
+        unsigned int count = rq->ring.desc_count;
 
         paddr = (u64)rq->ring.base_addr | VNIC_PADDR_TARGET;
         writeq(paddr, &rq->ctrl->ring_base);
-        iowrite32(rq->ring.desc_count, &rq->ctrl->ring_size);
+        iowrite32(count, &rq->ctrl->ring_size);
         iowrite32(cq_index, &rq->ctrl->cq_index);
         iowrite32(error_interrupt_enable, &rq->ctrl->error_interrupt_enable);
         iowrite32(error_interrupt_offset, &rq->ctrl->error_interrupt_offset);
@@ -132,8 +133,8 @@ void vnic_rq_init_start(struct vnic_rq *rq, unsigned int cq_index,
         iowrite32(posted_index, &rq->ctrl->posted_index);
 
         rq->to_use = rq->to_clean =
-                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
-                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
 }
 
 void vnic_rq_init(struct vnic_rq *rq, unsigned int cq_index,
@@ -184,6 +185,7 @@ void vnic_rq_clean(struct vnic_rq *rq,
 {
         struct vnic_rq_buf *buf;
         u32 fetch_index;
+        unsigned int count = rq->ring.desc_count;
 
         BUG_ON(ioread32(&rq->ctrl->enable));
 
@@ -200,8 +202,8 @@ void vnic_rq_clean(struct vnic_rq *rq,
         /* Use current fetch_index as the ring starting point */
         fetch_index = ioread32(&rq->ctrl->fetch_index);
         rq->to_use = rq->to_clean =
-                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES]
-                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES];
+                &rq->bufs[fetch_index / VNIC_RQ_BUF_BLK_ENTRIES(count)]
+                        [fetch_index % VNIC_RQ_BUF_BLK_ENTRIES(count)];
         iowrite32(fetch_index, &rq->ctrl->posted_index);
 
         vnic_dev_clear_desc_ring(&rq->ring);
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/enic/vnic_rq.h
index 35e736cc2d88..8f0fb78f0cdf 100644
--- a/drivers/net/enic/vnic_rq.h
+++ b/drivers/net/enic/vnic_rq.h
@@ -52,12 +52,16 @@ struct vnic_rq_ctrl {
         u32 pad10;
 };
 
-/* Break the vnic_rq_buf allocations into blocks of 64 entries */
-#define VNIC_RQ_BUF_BLK_ENTRIES 64
-#define VNIC_RQ_BUF_BLK_SZ \
-        (VNIC_RQ_BUF_BLK_ENTRIES * sizeof(struct vnic_rq_buf))
+/* Break the vnic_rq_buf allocations into blocks of 32/64 entries */
+#define VNIC_RQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_RQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_RQ_BUF_BLK_ENTRIES(entries) \
+        ((unsigned int)((entries < VNIC_RQ_BUF_DFLT_BLK_ENTRIES) ? \
+        VNIC_RQ_BUF_MIN_BLK_ENTRIES : VNIC_RQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_RQ_BUF_BLK_SZ(entries) \
+        (VNIC_RQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_rq_buf))
 #define VNIC_RQ_BUF_BLKS_NEEDED(entries) \
-        DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES)
+        DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES(entries))
 #define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)
 
 struct vnic_rq_buf {
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c
index ed090a3d9319..6c4d4f7f100f 100644
--- a/drivers/net/enic/vnic_wq.c
+++ b/drivers/net/enic/vnic_wq.c
@@ -37,7 +37,7 @@ 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]) {
                         pr_err("Failed to alloc wq_bufs\n");
                         return -ENOMEM;
@@ -46,14 +46,14 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
 
         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;
@@ -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,
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/enic/vnic_wq.h
index 9c34d41a887e..1c8213959fc4 100644
--- a/drivers/net/enic/vnic_wq.h
+++ b/drivers/net/enic/vnic_wq.h
@@ -60,12 +60,16 @@ struct vnic_wq_buf {
         void *desc;
 };
 
-/* Break the vnic_wq_buf allocations into blocks of 64 entries */
-#define VNIC_WQ_BUF_BLK_ENTRIES 64
-#define VNIC_WQ_BUF_BLK_SZ \
-        (VNIC_WQ_BUF_BLK_ENTRIES * sizeof(struct vnic_wq_buf))
+/* Break the vnic_wq_buf allocations into blocks of 32/64 entries */
+#define VNIC_WQ_BUF_MIN_BLK_ENTRIES 32
+#define VNIC_WQ_BUF_DFLT_BLK_ENTRIES 64
+#define VNIC_WQ_BUF_BLK_ENTRIES(entries) \
+        ((unsigned int)((entries < VNIC_WQ_BUF_DFLT_BLK_ENTRIES) ? \
+        VNIC_WQ_BUF_MIN_BLK_ENTRIES : VNIC_WQ_BUF_DFLT_BLK_ENTRIES))
+#define VNIC_WQ_BUF_BLK_SZ(entries) \
+        (VNIC_WQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_wq_buf))
 #define VNIC_WQ_BUF_BLKS_NEEDED(entries) \
-        DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES)
+        DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES(entries))
 #define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)
 
 struct vnic_wq {