From: Claire Chang <tientzu@chromium.org>
Date: Fri, 27 Aug 2021 03:48:02 +0000 (+0800)
Subject: swiotlb: use depends on for DMA_RESTRICTED_POOL
X-Git-Tag: v5.15-rc1~106^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3c4b1341e8320e63f197a554fc5a25686a11d22;p=thirdparty%2Flinux.git

swiotlb: use depends on for DMA_RESTRICTED_POOL

Use depends on instead of select for DMA_RESTRICTED_POOL; otherwise it
will make SWIOTLB user configurable and cause compile errors for some
arch (e.g. mips).

Fixes: 0b84e4f8b793 ("swiotlb: Add restricted DMA pool initialization")
Acked-by: Will Deacon <will@kernel.org>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Claire Chang <tientzu@chromium.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
index 3e961dc39634b..d19f9fef4ab93 100644
--- a/kernel/dma/Kconfig
+++ b/kernel/dma/Kconfig
@@ -82,8 +82,7 @@ config SWIOTLB
 
 config DMA_RESTRICTED_POOL
 	bool "DMA Restricted Pool"
-	depends on OF && OF_RESERVED_MEM
-	select SWIOTLB
+	depends on OF && OF_RESERVED_MEM && SWIOTLB
 	help
 	  This enables support for restricted DMA pools which provide a level of
 	  DMA memory protection on systems with limited hardware protection