From: Christoph Hellwig <hch@lst.de>
Date: Tue, 19 Nov 2019 16:35:36 +0000 (+0100)
Subject: dma-direct: don't check swiotlb=force in dma_direct_map_resource
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4268ac6ae5870af10a7417b22990d615f72f77e2;p=linux.git

dma-direct: don't check swiotlb=force in dma_direct_map_resource

When mapping resources we can't just use swiotlb ram for bounce
buffering.  Switch to a direct dma_capable check instead.

Fixes: cfced786969c ("dma-mapping: remove the default map_resource implementation")
Reported-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 077876ae5c743..a479bd2d1e8b1 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -412,7 +412,7 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
 {
 	dma_addr_t dma_addr = paddr;
 
-	if (unlikely(!dma_direct_possible(dev, dma_addr, size))) {
+	if (unlikely(!dma_capable(dev, dma_addr, size))) {
 		report_addr(dev, dma_addr, size);
 		return DMA_MAPPING_ERROR;
 	}