Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a00459 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: fix calls to dma_set_mask_and_coherent() 



The change to use dma_set_mask_and_coherent() incorrectly made a second
call with the 32 bit DMA mask value when the call with the 64 bit DMA
mask value succeeded.

[mkp: fixed commit message]

Fixes: e4db40e7 ("scsi: hisi_sas: use dma_set_mask_and_coherent")
Cc: <stable@vger.kernel.org>
Suggested-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 732f3238

drivers/scsi/hisi_sas/hisi_sas_main.c

+6 −2
Original line number Diff line number Diff line
@@ -2323,6 +2323,7 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, 
	struct Scsi_Host *shost;

	struct hisi_hba *hisi_hba;

	struct device *dev = &pdev->dev;

	int error;



	shost = scsi_host_alloc(hw->sht, sizeof(*hisi_hba));

	if (!shost) {
@@ -2343,8 +2344,11 @@ static struct Scsi_Host *hisi_sas_shost_alloc(struct platform_device *pdev, 
	if (hisi_sas_get_fw_info(hisi_hba) < 0)

		goto err_out;



	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) &&

	    dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {

	error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));

	if (error)

		error = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));



	if (error) {

		dev_err(dev, "No usable DMA addressing method\n");

		goto err_out;

	}

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+5 −3
Original line number Diff line number Diff line
@@ -2447,10 +2447,12 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (rc)

		goto err_out_disable_device;



	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) ||

	    dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) {

	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (rc)

		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (rc) {

		dev_err(dev, "No usable DMA addressing method\n");

		rc = -EIO;

		rc = -ENODEV;

		goto err_out_regions;

	}