From bab10f0eca9115f774fabeb78e0009668d4e4bad Mon Sep 17 00:00:00 2001 From: Subramanian Ananthanarayanan Date: Wed, 22 Jul 2020 12:40:43 +0530 Subject: [PATCH] slimbus: slim-msm-ngd: Add 64 bit iommu mask support Added 64 bit mask support in slimbus driver for iommu mapping. Change-Id: I7d4a6be851346c372e0745f6e1bcdb9d71111886 Signed-off-by: Subramanian Ananthanarayanan --- drivers/slimbus/slim-msm-ngd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/slim-msm-ngd.c b/drivers/slimbus/slim-msm-ngd.c index 9b1bfc001457..db36dd9e2a71 100644 --- a/drivers/slimbus/slim-msm-ngd.c +++ b/drivers/slimbus/slim-msm-ngd.c @@ -1871,10 +1871,13 @@ 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 32 bit DMA mask\n"); - goto err_nobulk; + 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 */