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

Commit 38fabcc9 authored by Thierry Reding's avatar Thierry Reding
Browse files

gpu: host1x: Restrict IOVA space to DMA mask 



On Tegra186 and later, the ARM SMMU provides an input address space that
is 48 bits wide. However, memory clients can only address up to 40 bits.
If the geometry is used as-is, allocations of IOVA space can end up in a
region that is not addressable by the memory clients.

To fix this, restrict the IOVA space to the DMA mask of the host1x
device.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 67a82dbc

drivers/gpu/host1x/dev.c

+6 −3
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ static int host1x_probe(struct platform_device *pdev) 
	host->group = iommu_group_get(&pdev->dev);

	if (host->group) {

		struct iommu_domain_geometry *geometry;

		u64 mask = dma_get_mask(host->dev);

		dma_addr_t start, end;

		unsigned long order;



		err = iova_cache_get();
@@ -310,11 +312,12 @@ static int host1x_probe(struct platform_device *pdev) 
		}



		geometry = &host->domain->geometry;

		start = geometry->aperture_start & mask;

		end = geometry->aperture_end & mask;



		order = __ffs(host->domain->pgsize_bitmap);

		init_iova_domain(&host->iova, 1UL << order,

				 geometry->aperture_start >> order);

		host->iova_end = geometry->aperture_end;

		init_iova_domain(&host->iova, 1UL << order, start >> order);

		host->iova_end = end;

	}



skip_iommu: