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

Commit 31027b97 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "slimbus: slim-msm-ngd: Add 64 bit iommu mask support"

parents 96103a3a bab10f0e

drivers/slimbus/slim-msm-ngd.c

+6 −3
Original line number Diff line number Diff line
@@ -1871,11 +1871,14 @@ static int ngd_slim_probe(struct platform_device *pdev) 
		goto err_nobulk;

	}



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

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

	if (ret) {

		dev_err(&pdev->dev, "could not set 64 bit DMA mask,trying 32\n");

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

			dev_err(&pdev->dev, "could not set 32 bit DMA mask\n");

			goto err_nobulk;

		}

	}



	/* typical txn numbers and size used in bulk operation */

	dev->bulk.buf_sz = SLIM_MAX_TXNS * 8;