Commit c569de89 authored by Suganath Prabu S's avatar Suganath Prabu S Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Force reply post array allocations to be within same 4 GB region 

According to the MPI specification, reply post array buffers can not cross
a 4 GB boundary.

While allocating, if any buffer crosses the 4 GB boundary, then:

 - Release the already allocated memory pools; and

 - Reallocate them by changing the DMA coherent mask to 32-bit

Link: https://lore.kernel.org/r/20210305102904.7560-7-suganath-prabu.subramani@broadcom.com


Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2e4e8587

drivers/scsi/mpt3sas/mpt3sas_base.c

+39 −16
Original line number Original line Diff line number Diff line
@@ -5629,6 +5629,39 @@ _base_allocate_reply_free_dma_pool(struct MPT3SAS_ADAPTER *ioc, u32 sz) 
	return 0;

	return 0;

}

}





/**

 * _base_allocate_reply_post_free_array - Allocating DMA'able memory

 *			for reply post free array.

 * @ioc: Adapter object

 * @reply_post_free_array_sz: DMA Pool size

 * Return: 0 for success, non-zero for failure.

 */



static int

_base_allocate_reply_post_free_array(struct MPT3SAS_ADAPTER *ioc,

	u32 reply_post_free_array_sz)

{

	ioc->reply_post_free_array_dma_pool =

	    dma_pool_create("reply_post_free_array pool",

	    &ioc->pdev->dev, reply_post_free_array_sz, 16, 0);

	if (!ioc->reply_post_free_array_dma_pool)

		return -ENOMEM;

	ioc->reply_post_free_array =

	    dma_pool_alloc(ioc->reply_post_free_array_dma_pool,

	    GFP_KERNEL, &ioc->reply_post_free_array_dma);

	if (!ioc->reply_post_free_array)

		return -EAGAIN;

	if (!mpt3sas_check_same_4gb_region((long)ioc->reply_post_free_array,

	    reply_post_free_array_sz)) {

		dinitprintk(ioc, pr_err(

		    "Bad Reply Free Pool! Reply Free (0x%p) Reply Free dma = (0x%llx)\n",

		    ioc->reply_free,

		    (unsigned long long) ioc->reply_free_dma));

		ioc->use_32bit_dma = true;

		return -EAGAIN;

	}

	return 0;

}

/**

/**

 * base_alloc_rdpq_dma_pool - Allocating DMA'able memory

 * base_alloc_rdpq_dma_pool - Allocating DMA'able memory

 *                     for reply queues.

 *                     for reply queues.
@@ -6101,22 +6134,12 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) 
	if (ioc->rdpq_array_enable) {

	if (ioc->rdpq_array_enable) {

		reply_post_free_array_sz = ioc->reply_queue_count *

		reply_post_free_array_sz = ioc->reply_queue_count *

		    sizeof(Mpi2IOCInitRDPQArrayEntry);

		    sizeof(Mpi2IOCInitRDPQArrayEntry);

		ioc->reply_post_free_array_dma_pool =

		rc = _base_allocate_reply_post_free_array(ioc,

		    dma_pool_create("reply_post_free_array pool",

		    reply_post_free_array_sz);

		    &ioc->pdev->dev, reply_post_free_array_sz, 16, 0);

		if (rc == -ENOMEM)

		if (!ioc->reply_post_free_array_dma_pool) {

			return -ENOMEM;

			dinitprintk(ioc,

		else if (rc == -EAGAIN)

				    ioc_info(ioc, "reply_post_free_array pool: dma_pool_create failed\n"));

			goto try_32bit_dma;

			goto out;

		}

		ioc->reply_post_free_array =

		    dma_pool_alloc(ioc->reply_post_free_array_dma_pool,

		    GFP_KERNEL, &ioc->reply_post_free_array_dma);

		if (!ioc->reply_post_free_array) {

			dinitprintk(ioc,

				    ioc_info(ioc, "reply_post_free_array pool: dma_pool_alloc failed\n"));

			goto out;

		}

	}

	}

	ioc->config_page_sz = 512;

	ioc->config_page_sz = 512;

	ioc->config_page = dma_alloc_coherent(&ioc->pdev->dev,

	ioc->config_page = dma_alloc_coherent(&ioc->pdev->dev,