GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-05 14:04:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
This commit is contained in:
Christoph Hellwig 2018-08-24 08:07:52 +02:00
parent 5b394b2ddf
commit c1d0af1a1d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/dma/direct.c
View file

@ -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) int dma_direct_supported(struct device *dev, u64 mask)
{ {
#ifdef CONFIG_ZONE_DMA #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; return 0;
#else #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 * memory, or by providing a ZONE_DMA32. If neither is the case, the
* architecture needs to use an IOMMU instead of the direct mapping. * 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; return 0;
#endif #endif
/* /*