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

Christoph Hellwig · gregkh · commit b8444fa88da8 · 2020-01-26T10:01:08.000+01:00
[ Upstream commit 4268ac6 ] When mapping resources we can't just use swiotlb ram for bounce buffering. Switch to a direct dma_capable check instead. Fixes: cfced78 ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
@@ -375,7 +375,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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,7 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,`
`375`	`375`	`{`
`376`	`376`	`dma_addr_t dma_addr = paddr;`
`377`	`377`
`378`		`- if (unlikely(!dma_direct_possible(dev, dma_addr, size))) {`
	`378`	`+ if (unlikely(!dma_capable(dev, dma_addr, size))) {`
`379`	`379`	`report_addr(dev, dma_addr, size);`
`380`	`380`	`return DMA_MAPPING_ERROR;`
`381`	`381`	`}`