Skip to content

Commit 1a2dcbd

Browse files
sreekanthbrcmtorvalds
authored andcommitted
scsi: mpt3sas: re-do lost mpt3sas DMA mask fix
This is a re-do of commit e0e0747 ("scsi: mpt3sas: Fix return value check of dma_get_required_mask()"), which I ended up undoing in a mis-merge in commit 62e6e59 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"). The original commit message was scsi: mpt3sas: Fix return value check of dma_get_required_mask() Fix the incorrect return value check of dma_get_required_mask(). Due to this incorrect check, the driver was always setting the DMA mask to 63 bit. Link: https://lore.kernel.org/r/[email protected] Fixes: ba27c5c ("scsi: mpt3sas: Don't change the DMA coherent mask after allocations") Signed-off-by: Sreekanth Reddy <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]> and this fix was lost when I mis-merged the conflict with commit 9df6509 ("scsi: mpt3sas: Don't change DMA mask while reallocating pools"). Reported-by: Juergen Gross <[email protected]> Fixes: 62e6e59 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") Link: https://lore.kernel.org/all/CAHk-=wjaK-TxrNaGtFDpL9qNHL1MVkWXO1TT6vObD5tXMSC4Zg@mail.gmail.com Signed-off-by: Linus Torvalds <[email protected]>
1 parent a970174 commit 1a2dcbd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2993,7 +2993,7 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)
29932993
u64 coherent_dma_mask, dma_mask;
29942994

29952995
if (ioc->is_mcpu_endpoint || sizeof(dma_addr_t) == 4 ||
2996-
dma_get_required_mask(&pdev->dev) <= 32) {
2996+
dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(32)) {
29972997
ioc->dma_mask = 32;
29982998
coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);
29992999
/* Set 63 bit DMA mask for all SAS3 and SAS35 controllers */

0 commit comments

Comments
 (0)