lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 077/141] scsi: mpt3sas: Fix return value check of dma_get_required_mask()
    Date
    From: Sreekanth Reddy <sreekanth.reddy@broadcom.com>

    [ Upstream commit e0e0747de0ea3dd87cdbb0393311e17471a9baf1 ]

    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/20220913120538.18759-2-sreekanth.reddy@broadcom.com
    Fixes: ba27c5cf286d ("scsi: mpt3sas: Don't change the DMA coherent mask after allocations")
    Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
    index 18f85c963944..c1b76cda60db 100644
    --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
    +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
    @@ -2825,7 +2825,7 @@ _base_config_dma_addressing(struct MPT3SAS_ADAPTER *ioc, struct pci_dev *pdev)

    if (ioc->is_mcpu_endpoint ||
    sizeof(dma_addr_t) == 4 || ioc->use_32bit_dma ||
    - dma_get_required_mask(&pdev->dev) <= 32)
    + dma_get_required_mask(&pdev->dev) <= DMA_BIT_MASK(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)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:02    [W:4.197 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site