Commit 9576a36c authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

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: ea5a8b09 ("ionic: reduce contiguous memory allocation requirement")
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b419e65

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+47 −22
Original line number Diff line number Diff line
@@ -518,6 +518,30 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
		goto err_out_free_cq_info;

	}



	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);
@@ -542,6 +566,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
		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);