summaryrefslogtreecommitdiffstats
path: root/kernel/dma
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@linux.intel.com>2018-10-03 16:48:07 -0700
committerChristoph Hellwig <hch@lst.de>2018-10-05 09:15:15 +0200
commit1fc8e6423edb4bba365b0780c2fcddfb921b24b2 (patch)
treea628cadf739b7d945e5c2375365b1cfa6f8906cc /kernel/dma
parent6db37ad7c27bda2f62d1ef6ad0496e359c562c1a (diff)
downloadblackbird-op-linux-1fc8e6423edb4bba365b0780c2fcddfb921b24b2.tar.gz
blackbird-op-linux-1fc8e6423edb4bba365b0780c2fcddfb921b24b2.zip
dma-direct: fix return value of dma_direct_supported
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> Acked-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'kernel/dma')
-rw-r--r--kernel/dma/direct.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 170bd322a94a..674a8da22844 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)
OpenPOWER on IntegriCloud