2021-08-27 03:51:56

by Claire Chang

Subject: [PATCH] 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")
Reported-by: Guenter Roeck <[email protected]>
Signed-off-by: Claire Chang <[email protected]>
---
kernel/dma/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
index fd4db714d86b..1b02179758cb 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
--
2.33.0.259.gc128427fd7-goog

2021-08-31 15:19:56

by Will Deacon

Subject: Re: [PATCH] swiotlb: use depends on for DMA_RESTRICTED_POOL

On Fri, Aug 27, 2021 at 11:48:02AM +0800, Claire Chang wrote:
> 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")
> Reported-by: Guenter Roeck <[email protected]>
> Signed-off-by: Claire Chang <[email protected]>
> ---
> kernel/dma/Kconfig | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
> index fd4db714d86b..1b02179758cb 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

Acked-by: Will Deacon <[email protected]>

Will

2021-08-31 18:51:30

by Konrad Rzeszutek Wilk

Subject: Re: [PATCH] swiotlb: use depends on for DMA_RESTRICTED_POOL

On Tue, Aug 31, 2021 at 04:17:47PM +0100, Will Deacon wrote:
> On Fri, Aug 27, 2021 at 11:48:02AM +0800, Claire Chang wrote:
> > 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")
> > Reported-by: Guenter Roeck <[email protected]>
> > Signed-off-by: Claire Chang <[email protected]>
> > ---
> > kernel/dma/Kconfig | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/kernel/dma/Kconfig b/kernel/dma/Kconfig
> > index fd4db714d86b..1b02179758cb 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
>
> Acked-by: Will Deacon <[email protected]>

I put it in linux-next and devel/for-linus-5.15.

I will wait a day and see if there are any issues with linux-next and if
not will send out a GIT pull.

Thanks!


>
> Will