Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "A few fixes for the fallout of being a little more pedantic about dma
  masks"

* tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping:
  of/platform: initialise AMBA default DMA masks
  sparc: set a default 32-bit dma mask for OF devices
  kernel/dma/direct: take DMA offset into account in dma_direct_supported

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 1c35b7b945d0..de87b0282e74 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -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
         /*