hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Thierry Reding 2019-02-01 14:28:27 +01:00
parent 67a82dbc0a
commit 38fabcc953
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/host1x/dev.c
View File

@ -283,6 +283,8 @@ static int host1x_probe(struct platform_device *pdev)
host->group = iommu_group_get(&pdev->dev); host->group = iommu_group_get(&pdev->dev);
if (host->group) { if (host->group) {
struct iommu_domain_geometry *geometry; struct iommu_domain_geometry *geometry;
u64 mask = dma_get_mask(host->dev);
dma_addr_t start, end;
unsigned long order; unsigned long order;
err = iova_cache_get(); err = iova_cache_get();
@ -310,11 +312,12 @@ static int host1x_probe(struct platform_device *pdev)
} }
geometry = &host->domain->geometry; geometry = &host->domain->geometry;
start = geometry->aperture_start & mask;
end = geometry->aperture_end & mask;
order = __ffs(host->domain->pgsize_bitmap); order = __ffs(host->domain->pgsize_bitmap);
init_iova_domain(&host->iova, 1UL << order, init_iova_domain(&host->iova, 1UL << order, start >> order);
geometry->aperture_start >> order); host->iova_end = end;
host->iova_end = geometry->aperture_end;
} }
skip_iommu: skip_iommu: