Commit a1c7a7cd authored Dec 30, 2022 by Martin K. Petersen

Merge branch '6.2/mpt-mpi' into 6.2/scsi-fixes



Pull in Broadcom MPI/MPT fixes that conflicted with patch resolution
upstream.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parents 6b1c374c d347a951

drivers/scsi/mpi3mr/mpi3mr_fw.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3633,8 +3633,7 @@ int mpi3mr_setup_resources(struct mpi3mr_ioc *mrioc)
		int i, retval = 0, capb = 0;
		u16 message_control;
		u64 dma_mask = mrioc->dma_mask ? mrioc->dma_mask :
		(((dma_get_required_mask(&pdev->dev) > DMA_BIT_MASK(32)) &&
		(sizeof(dma_addr_t) > 4)) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32));
		((sizeof(dma_addr_t) > 4) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32));

		if (pci_enable_device_mem(pdev)) {
		ioc_err(mrioc, "pci_enable_device_mem: failed\n");

drivers/scsi/mpt3sas/mpt3sas_base.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2992,8 +2992,7 @@ _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 \|\|
		dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(32)) {
		if (ioc->is_mcpu_endpoint \|\| sizeof(dma_addr_t) == 4) {
		ioc->dma_mask = 32;
		coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);
		/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */