swiotlb: Use dma_direct_supported() for swiotlb_ops
authorChristoph Hellwig <hch@lst.de>
Mon, 9 Apr 2018 09:15:17 +0000 (11:15 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 9 Apr 2018 16:20:09 +0000 (18:20 +0200)
swiotlb_alloc() calls dma_direct_alloc(), which can satisfy lower than 32-bit
DMA mask requests using GFP_DMA if the architecture supports it.  Various
x86 drivers rely on that, so we need to support that.  At the same time
the whole kernel expects a 32-bit DMA mask to just work, so the other magic
in swiotlb_dma_supported() isn't actually needed either.

Reported-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: iommu@lists.linux-foundation.org
Fixes: 6e4bf5867783 ("x86/dma: Use generic swiotlb_ops")
Link: http://lkml.kernel.org/r/20180409091517.6619-2-hch@lst.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
lib/swiotlb.c

index c43ec227146982272c6c3a2c23762fafa2e45dd2..c67b062611609bf5b0f86e3908752ff15e0da5d0 100644 (file)
@@ -1130,6 +1130,6 @@ const struct dma_map_ops swiotlb_dma_ops = {
        .unmap_sg               = swiotlb_unmap_sg_attrs,
        .map_page               = swiotlb_map_page,
        .unmap_page             = swiotlb_unmap_page,
-       .dma_supported          = swiotlb_dma_supported,
+       .dma_supported          = dma_direct_supported,
 };
 #endif /* CONFIG_DMA_DIRECT_OPS */