Commit 1fc8e642 authored Oct 03, 2018 by Alexander Duyck Committed by Christoph Hellwig Oct 05, 2018

dma-direct: fix return value of dma_direct_supported



It appears that in commit 9d7a224b ("dma-direct: always allow dma mask
<= physiscal memory size") the logic of the test was changed from a "<" to
a ">=" however I don't see any reason for that change. I am assuming that
there was some additional change planned, specifically I suspect the logic
was intended to be reversed and possibly used for a return. Since that is
the case I have gone ahead and done that.

This addresses issues I had on my system that prevented me from booting
with the above mentioned commit applied on an x86_64 system w/ Intel IOMMU.

Fixes: 9d7a224b ("dma-direct: always allow dma mask <= physiscal memory size")
Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 6db37ad7

kernel/dma/direct.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -301,9 +301,7 @@ int dma_direct_supported(struct device *dev, u64 mask)

		min_mask = min_t(u64, min_mask, (max_pfn - 1) << PAGE_SHIFT);

		if (mask >= phys_to_dma(dev, min_mask))
		return 0;
		return 1;
		return mask >= phys_to_dma(dev, min_mask);
		}

		int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)

Admin message