This is a note to let you know that I've just added the patch titled
scsi: mpt3sas: Remove usage of dma_get_required_mask() API
to the 6.1-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:
scsi-mpt3sas-remove-usage-of-dma_get_required_mask-api.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 06e472acf964649a58b7de35fc9cdc3151acb970 Mon Sep 17 00:00:00 2001
From: Sreekanth Reddy <sreekanth.reddy@xxxxxxxxxxxx>
Date: Fri, 28 Oct 2022 14:46:55 +0530
Subject: scsi: mpt3sas: Remove usage of dma_get_required_mask() API
From: Sreekanth Reddy <sreekanth.reddy@xxxxxxxxxxxx>
commit 06e472acf964649a58b7de35fc9cdc3151acb970 upstream.
Remove the usage of dma_get_required_mask() API. Directly set the DMA mask
to 63/64 if the system is a 64bit machine.
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20221028091655.17741-2-sreekanth.reddy@xxxxxxxxxxxx
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Cc: Salvatore Bonaccorso <carnil@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -2992,8 +2992,7 @@ _base_config_dma_addressing(struct MPT3S
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 */
Patches currently in stable-queue which might be from sreekanth.reddy@xxxxxxxxxxxx are
queue-6.1/scsi-mpt3sas-remove-usage-of-dma_get_required_mask-api.patch
