This is a note to let you know that I've just added the patch titled
Revert "scsi: mpt3sas: Fix return value check of dma_get_required_mask()"
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-scsi-mpt3sas-fix-return-value-check-of-dma_get_required_mask.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6ac451d8d12b4309b523b600449bb2f4494ac5bb Mon Sep 17 00:00:00 2001
From: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
Date: Wed, 8 Mar 2023 17:14:56 +0100
Subject: Revert "scsi: mpt3sas: Fix return value check of dma_get_required_mask()"
From: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
This reverts commit e0e0747de0ea3dd87cdbb0393311e17471a9baf1.
As noted in 1a2dcbdde82e ("scsi: mpt3sas: re-do lost mpt3sas DMA mask
fix") in mainline there was a mis-merge in commit 62e6e5940c0c ("Merge
tag 'scsi-misc' of
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"). causing that
the fix needed to be redone later on again. To make series of patches
apply cleanly to the stable series where e0e0747de0ea ("scsi: mpt3sas:
Fix return value check of dma_get_required_mask()") was backported,
revert the aforementioned commit.
No upstream commit exists for this commit.
Link: https://lore.kernel.org/regressions/yq1sfehmjnb.fsf@xxxxxxxxxxxxxxxxxxxx/
Signed-off-by: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2993,7 +2993,7 @@ _base_config_dma_addressing(struct MPT3S
if (ioc->is_mcpu_endpoint ||
sizeof(dma_addr_t) == 4 || ioc->use_32bit_dma ||
- dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(32))
+ dma_get_required_mask(&pdev->dev) <= 32)
ioc->dma_mask = 32;
/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */
else if (ioc->hba_mpi_version_belonged > MPI2_VERSION)
Patches currently in stable-queue which might be from carnil@xxxxxxxxxx are
queue-5.15/scsi-mpt3sas-don-t-change-dma-mask-while-reallocating-pools.patch
queue-5.15/scsi-mpt3sas-re-do-lost-mpt3sas-dma-mask-fix.patch
queue-5.15/scsi-mpt3sas-remove-usage-of-dma_get_required_mask-api.patch
queue-5.15/revert-scsi-mpt3sas-fix-return-value-check-of-dma_get_required_mask.patch
