media: intel/ipu6: Fix dma mask for non-secure mode
Subsystems (2)
PATCH v2 1/1 media: intel/ipu6: Fix dma mask for non-secure mode
We use dma_get_mask() of auxdev device for calculate iova pfn limit. This is always 32 bit mask as we do not initialize the mask (and we can not do so, since dev->dev_mask is NULL anyways for auxdev).
Since we need 31 bit mask for non-secure mode use mmu_info->aperture_end which is properly initialized to correct mask for both modes.
Fixes daabc5c64703 ("media: ipu6: not override the dma_ops of device in driver")
Signed-off-by Stanislaw Gruszka <[email protected]>
---
v1 -> v2: do not introduce wrapper
drivers/media/pci/intel/ipu6/ipu6-dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-dma.c +2 -2
@@ -172,7 +172,7 @@ void *ipu6_dma_alloc(struct ipu6_bus_device *sys, size_t size, count =PHYS_PFN (size); iova =alloc_iova (&mmu->dmap->iovad, count, -PHYS_PFN (dma_get_mask (dev)),0 ); +PHYS_PFN (mmu->dmap->mmu_info->aperture_end),0 );if (!iova) goto out_kfree;
@@ -398,7 +398,7 @@ int ipu6_dma_map_sg(struct ipu6_bus_device *sys, struct scatterlist *sglist, nents, npages); iova =alloc_iova (&mmu->dmap->iovad, npages, -PHYS_PFN (dma_get_mask (dev)),0 ); +PHYS_PFN (mmu->dmap->mmu_info->aperture_end),0 );if (!iova)return 0 ;
Signature · 1 line
2.34.1