On Mon, 2022-10-24 at 14:55 +0200, Juergen Gross wrote:
[...]
> Please recheck the backported patch in 5.10.y. It is _wrong_. The
> backport
> has:
>
> --- a/drivers/scsi/mpt3sas/mpt3sas_base.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
> @@ -2993,7 +2993,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)
>
> While the upstream patch has:
>
> + if (ioc->is_mcpu_endpoint || sizeof(dma_addr_t) == 4 ||
> + dma_get_required_mask(&pdev->dev) <= 32) {
> ioc->dma_mask = 32;
> + coherent_dma_mask = dma_mask = DMA_BIT_MASK(32);
>
That's not the upstream commit. The quoted upstream patch in the
stable commit is:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e0e0747de0ea3dd87cdbb0393311e17471a9baf1
Which has the same diff as you quoted for the stable tree.
James
Attachment:
signature.asc
Description: This is a digitally signed message part
