ionic: contiguous memory for notifyq

The event notification queue is set up a little differently in the
NIC and so the notifyq q and cq descriptor structures need to be
contiguous, which got missed in an earlier patch that separated
out the q and cq descriptor allocations.  That patch was aimed at
making the big tx and rx descriptor queue allocations easier to
manage - the notifyq is much smaller and doesn't need to be split.
This patch simply adds an if/else and slightly different code for
the notifyq descriptor allocation.

Fixes: aacce98cacbd ("ionic: reduce contiguous memory allocation requirement")
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index 1b4d5eb9bbc9913878691c33ee6e165e2be5fc2c..969979b31e93ff975c45f949ed2d36a4649f75cf 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -518,30 +518,55 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
                goto err_out_free_cq_info;
        }
 
-       new->q_size = PAGE_SIZE + (num_descs * desc_size);
-       new->q_base = dma_alloc_coherent(dev, new->q_size, &new->q_base_pa,
-                                        GFP_KERNEL);
-       if (!new->q_base) {
-               netdev_err(lif->netdev, "Cannot allocate queue DMA memory\n");
-               err = -ENOMEM;
-               goto err_out_free_cq_info;
-       }
-       q_base = PTR_ALIGN(new->q_base, PAGE_SIZE);
-       q_base_pa = ALIGN(new->q_base_pa, PAGE_SIZE);
-       ionic_q_map(&new->q, q_base, q_base_pa);
+       if (flags & IONIC_QCQ_F_NOTIFYQ) {
+               int q_size, cq_size;
+
+               /* q & cq need to be contiguous in case of notifyq */
+               q_size = ALIGN(num_descs * desc_size, PAGE_SIZE);
+               cq_size = ALIGN(num_descs * cq_desc_size, PAGE_SIZE);
+
+               new->q_size = PAGE_SIZE + q_size + cq_size;
+               new->q_base = dma_alloc_coherent(dev, new->q_size,
+                                                &new->q_base_pa, GFP_KERNEL);
+               if (!new->q_base) {
+                       netdev_err(lif->netdev, "Cannot allocate qcq DMA memory\n");
+                       err = -ENOMEM;
+                       goto err_out_free_cq_info;
+               }
+               q_base = PTR_ALIGN(new->q_base, PAGE_SIZE);
+               q_base_pa = ALIGN(new->q_base_pa, PAGE_SIZE);
+               ionic_q_map(&new->q, q_base, q_base_pa);
+
+               cq_base = PTR_ALIGN(q_base + q_size, PAGE_SIZE);
+               cq_base_pa = ALIGN(new->q_base_pa + q_size, PAGE_SIZE);
+               ionic_cq_map(&new->cq, cq_base, cq_base_pa);
+               ionic_cq_bind(&new->cq, &new->q);
+       } else {
+               new->q_size = PAGE_SIZE + (num_descs * desc_size);
+               new->q_base = dma_alloc_coherent(dev, new->q_size, &new->q_base_pa,
+                                                GFP_KERNEL);
+               if (!new->q_base) {
+                       netdev_err(lif->netdev, "Cannot allocate queue DMA memory\n");
+                       err = -ENOMEM;
+                       goto err_out_free_cq_info;
+               }
+               q_base = PTR_ALIGN(new->q_base, PAGE_SIZE);
+               q_base_pa = ALIGN(new->q_base_pa, PAGE_SIZE);
+               ionic_q_map(&new->q, q_base, q_base_pa);
 
-       new->cq_size = PAGE_SIZE + (num_descs * cq_desc_size);
-       new->cq_base = dma_alloc_coherent(dev, new->cq_size, &new->cq_base_pa,
-                                         GFP_KERNEL);
-       if (!new->cq_base) {
-               netdev_err(lif->netdev, "Cannot allocate cq DMA memory\n");
-               err = -ENOMEM;
-               goto err_out_free_q;
+               new->cq_size = PAGE_SIZE + (num_descs * cq_desc_size);
+               new->cq_base = dma_alloc_coherent(dev, new->cq_size, &new->cq_base_pa,
+                                                 GFP_KERNEL);
+               if (!new->cq_base) {
+                       netdev_err(lif->netdev, "Cannot allocate cq DMA memory\n");
+                       err = -ENOMEM;
+                       goto err_out_free_q;
+               }
+               cq_base = PTR_ALIGN(new->cq_base, PAGE_SIZE);
+               cq_base_pa = ALIGN(new->cq_base_pa, PAGE_SIZE);
+               ionic_cq_map(&new->cq, cq_base, cq_base_pa);
+               ionic_cq_bind(&new->cq, &new->q);
        }
-       cq_base = PTR_ALIGN(new->cq_base, PAGE_SIZE);
-       cq_base_pa = ALIGN(new->cq_base_pa, PAGE_SIZE);
-       ionic_cq_map(&new->cq, cq_base, cq_base_pa);
-       ionic_cq_bind(&new->cq, &new->q);
 
        if (flags & IONIC_QCQ_F_SG) {
                new->sg_size = PAGE_SIZE + (num_descs * sg_desc_size);