Commit a9b21d32 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by sanglipeng
Browse files

scsi: mpt3sas: Don't change DMA mask while reallocating pools 

stable inclusion
from stable-v5.10.173
commit 2392303df240e7d036df8872ada176734e108036
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7X0QU

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2392303df240e7d036df8872ada176734e108036

--------------------------------

commit 9df65096 upstream.

When a pool crosses the 4GB boundary region then before reallocating pools
change the coherent DMA mask to 32 bits and keep the normal DMA mask set to
63/64 bits.

Link: https://lore.kernel.org/r/20220825075457.16422-2-sreekanth.reddy@broadcom.com


Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSalvatore Bonaccorso <carnil@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 2b10b90c

drivers/scsi/mpt3sas/mpt3sas_base.c

+14 −7
Original line number Diff line number Diff line
@@ -2822,19 +2822,26 @@ static int 
_base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)

{

	struct sysinfo s;

	u64 coherent_dma_mask, dma_mask;



	if (ioc->is_mcpu_endpoint ||

	    sizeof(dma_addr_t) == 4 || ioc->use_32bit_dma ||

	    dma_get_required_mask(&pdev->dev) <= 32)

	if (ioc->is_mcpu_endpoint || sizeof(dma_addr_t) == 4 ||

	    dma_get_required_mask(&pdev->dev) <= 32) {

		ioc->dma_mask = 32;

		coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);

	/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */

	else if (ioc->hba_mpi_version_belonged > MPI2_VERSION)

	} else if (ioc->hba_mpi_version_belonged > MPI2_VERSION) {

		ioc->dma_mask = 63;

	else

		coherent_dma_mask = dma_mask = DMA_BIT_MASK(63);

	} else {

		ioc->dma_mask = 64;

		coherent_dma_mask = dma_mask = DMA_BIT_MASK(64);

	}



	if (ioc->use_32bit_dma)

		coherent_dma_mask = DMA_BIT_MASK(32);



	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(ioc->dma_mask)) ||

	    dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(ioc->dma_mask)))

	if (dma_set_mask(&pdev->dev, dma_mask) ||

	    dma_set_coherent_mask(&pdev->dev, coherent_dma_mask))

		return -ENODEV;



	if (ioc->dma_mask > 32) {