Merge "dwc3-msm: Use upstream IOMMU driver based dma_ops() with USB dev" (d5d55ba0) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/dwc3-msm.c

+16 −8

Original line number	Diff line number	Diff line
		@@ -3020,6 +3020,13 @@ static int dwc3_msm_init_iommu(struct dwc3_msm *mdwc)
		return ret;
		}
		dev_dbg(mdwc->dev, "IOMMU mapping created: %pK\n", mdwc->iommu_map);
		ret = iommu_domain_set_attr(mdwc->iommu_map->domain,
		DOMAIN_ATTR_UPSTREAM_IOVA_ALLOCATOR, &atomic_ctx);
		if (ret) {
		dev_err(mdwc->dev, "set UPSTREAM_IOVA_ALLOCATOR failed(%d)\n",
		ret);
		goto release_mapping;
		}

		ret = iommu_domain_set_attr(mdwc->iommu_map->domain, DOMAIN_ATTR_ATOMIC,
		&atomic_ctx);
		@@ -3141,14 +3148,6 @@ static int dwc3_msm_probe(struct platform_device *pdev)
		if (!mdwc)
		return -ENOMEM;

		if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64))) {
		dev_err(&pdev->dev, "setting DMA mask to 64 failed.\n");
		if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
		dev_err(&pdev->dev, "setting DMA mask to 32 failed.\n");
		return -EOPNOTSUPP;
		}
		}

		platform_set_drvdata(pdev, mdwc);
		mdwc->dev = &pdev->dev;

		@@ -3341,6 +3340,15 @@ static int dwc3_msm_probe(struct platform_device *pdev)
		if (ret)
		goto err;

		if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64))) {
		dev_err(&pdev->dev, "setting DMA mask to 64 failed.\n");
		if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32))) {
		dev_err(&pdev->dev, "setting DMA mask to 32 failed.\n");
		ret = -EOPNOTSUPP;
		goto uninit_iommu;
		}
		}

		/* Assumes dwc3 is the first DT child of dwc3-msm */
		dwc3_node = of_get_next_available_child(node, NULL);
		if (!dwc3_node) {