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

Commit c1d0af1a authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

kernel/dma/direct: take DMA offset into account in dma_direct_supported 



When a device has a DMA offset the dma capable result will change due
to the difference between the physical and DMA address.  Take that into
account.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
parent 5b394b2d

kernel/dma/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, 
int dma_direct_supported(struct device *dev, u64 mask)

{

#ifdef CONFIG_ZONE_DMA

	if (mask < DMA_BIT_MASK(ARCH_ZONE_DMA_BITS))

	if (mask < phys_to_dma(dev, DMA_BIT_MASK(ARCH_ZONE_DMA_BITS)))

		return 0;

#else

	/*
@@ -177,7 +177,7 @@ int dma_direct_supported(struct device *dev, u64 mask) 
	 * memory, or by providing a ZONE_DMA32.  If neither is the case, the

	 * architecture needs to use an IOMMU instead of the direct mapping.

	 */

	if (mask < DMA_BIT_MASK(32))

	if (mask < phys_to_dma(dev, DMA_BIT_MASK(32)))

		return 0;

#endif

	/*