All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] dma-direct: Fix return value of dma_direct_supported
@ 2018-10-03 23:48 ` Alexander Duyck
  0 siblings, 0 replies; 17+ messages in thread
From: Alexander Duyck @ 2018-10-03 23:48 UTC (permalink / raw)
  To: iommu; +Cc: benh, robin.murphy, linux-kernel, gregkh, linuxppc-dev, linux

It appears that in commit 9d7a224b463e ("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: 9d7a224b463e ("dma-direct: always allow dma mask <= physiscal memory size")
Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
---
 kernel/dma/direct.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 5a0806b5351b..65872f6c2e93 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -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)


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2018-12-13 20:01 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-03 23:48 [PATCH] dma-direct: Fix return value of dma_direct_supported Alexander Duyck
2018-10-03 23:48 ` Alexander Duyck
2018-10-04 11:25 ` Robin Murphy
2018-10-04 11:25   ` Robin Murphy
2018-10-04 11:25   ` Robin Murphy
2018-10-04 15:13   ` Alexander Duyck
2018-10-04 15:13     ` Alexander Duyck
2018-10-04 15:13     ` Alexander Duyck
2018-10-05  7:17     ` Christoph Hellwig
2018-10-05  7:17       ` Christoph Hellwig
2018-10-05  7:17       ` Christoph Hellwig
2018-12-13 19:45     ` Lendacky, Thomas
2018-12-13 19:45       ` Lendacky, Thomas
2018-12-13 19:45       ` Lendacky, Thomas
2018-12-13 19:58       ` Christoph Hellwig
2018-12-13 19:58         ` Christoph Hellwig
2018-12-13 19:58         ` Christoph Hellwig

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.