Skip to content

Commit 381cae1

Browse files
Christoph Hellwiggeertu
authored andcommitted
riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM and ERRATA_THEAD_PBMT
RISCV_DMA_NONCOHERENT is also used for whacky non-standard non-coherent ops that use different hooks in dma-direct. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Conor Dooley <[email protected]> Reviewed-by: Robin Murphy <[email protected]> Reviewed-by: Lad Prabhakar <[email protected]> Tested-by: Samuel Holland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent fd96278 commit 381cae1

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ config RISCV_DMA_NONCOHERENT
273273
select ARCH_HAS_SYNC_DMA_FOR_CPU
274274
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
275275
select DMA_BOUNCE_UNALIGNED_KMALLOC if SWIOTLB
276-
select DMA_DIRECT_REMAP if MMU
277276

278277
config RISCV_NONSTANDARD_CACHE_OPS
279278
bool
@@ -549,6 +548,7 @@ config RISCV_ISA_ZICBOM
549548
depends on RISCV_ALTERNATIVE
550549
default y
551550
select RISCV_DMA_NONCOHERENT
551+
select DMA_DIRECT_REMAP
552552
help
553553
Adds support to dynamically detect the presence of the ZICBOM
554554
extension (Cache Block Management Operations) and enable its

arch/riscv/Kconfig.errata

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ config ERRATA_THEAD_PBMT
7777
config ERRATA_THEAD_CMO
7878
bool "Apply T-Head cache management errata"
7979
depends on ERRATA_THEAD && MMU
80+
select DMA_DIRECT_REMAP
8081
select RISCV_DMA_NONCOHERENT
8182
default y
8283
help

0 commit comments

Comments
 (0)