History

Merge tag 'renesas-fixes-for-v6.6-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes

Renesas fixes for v6.6 (take three) - Sort out a few Kconfig dependency issues for the rich set of RISC-V non-coherent DMA support. * tag 'renesas-fixes-for-v6.6-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM and ERRATA_THEAD_PBMT riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT

Arnd Bergmann committed 3 years ago

Commit 736a4aa2 parents 291c0d3 9eab43f4 files · +4 −3Browse files

Unified · Split

4 files
  1. arch/riscv/Kconfig +1 −2
  2. arch/riscv/Kconfig.errata +1 −0
  3. drivers/cache/Kconfig +1 −1
  4. drivers/soc/renesas/Kconfig +1 −0
arch/riscv/Kconfig+1−2
@@ -273,11 +273,9 @@ config RISCV_DMA_NONCOHERENT · 272 unmodified lines
273 select ARCH_HAS_SYNC_DMA_FOR_CPU273 select ARCH_HAS_SYNC_DMA_FOR_CPU
274 select ARCH_HAS_SYNC_DMA_FOR_DEVICE274 select ARCH_HAS_SYNC_DMA_FOR_DEVICE
275 select DMA_BOUNCE_UNALIGNED_KMALLOC if SWIOTLB275 select DMA_BOUNCE_UNALIGNED_KMALLOC if SWIOTLB
276 select DMA_DIRECT_REMAP if MMU
277 276
278config RISCV_NONSTANDARD_CACHE_OPS277config RISCV_NONSTANDARD_CACHE_OPS
279 bool278 bool
280 depends on RISCV_DMA_NONCOHERENT
281 help279 help
282 This enables function pointer support for non-standard noncoherent280 This enables function pointer support for non-standard noncoherent
283 systems to handle cache management.281 systems to handle cache management.
@@ -550,6 +548,7 @@ config RISCV_ISA_ZICBOM · 266 unmodified lines
550 depends on RISCV_ALTERNATIVE548 depends on RISCV_ALTERNATIVE
551 default y549 default y
552 select RISCV_DMA_NONCOHERENT550 select RISCV_DMA_NONCOHERENT
551 select DMA_DIRECT_REMAP
553 help552 help
554 Adds support to dynamically detect the presence of the ZICBOM553 Adds support to dynamically detect the presence of the ZICBOM
555 extension (Cache Block Management Operations) and enable its554 extension (Cache Block Management Operations) and enable its
arch/riscv/Kconfig.errata+1−0
@@ -77,6 +77,7 @@ config ERRATA_THEAD_PBMT · 76 unmodified lines
77config ERRATA_THEAD_CMO77config ERRATA_THEAD_CMO
78 bool "Apply T-Head cache management errata"78 bool "Apply T-Head cache management errata"
79 depends on ERRATA_THEAD && MMU79 depends on ERRATA_THEAD && MMU
80 select DMA_DIRECT_REMAP
80 select RISCV_DMA_NONCOHERENT81 select RISCV_DMA_NONCOHERENT
81 default y82 default y
82 help83 help
drivers/cache/Kconfig+1−1
@@ -3,7 +3,7 @@ menu "Cache Drivers" · 2 unmodified lines
3 3
4config AX45MP_L2_CACHE4config AX45MP_L2_CACHE
5 bool "Andes Technology AX45MP L2 Cache controller"5 bool "Andes Technology AX45MP L2 Cache controller"
6 depends on RISCV_DMA_NONCOHERENT6 depends on RISCV
7 select RISCV_NONSTANDARD_CACHE_OPS7 select RISCV_NONSTANDARD_CACHE_OPS
8 help8 help
9 Support for the L2 cache controller on Andes Technology AX45MP platforms.9 Support for the L2 cache controller on Andes Technology AX45MP platforms.
drivers/soc/renesas/Kconfig+1−0
@@ -335,6 +335,7 @@ config ARCH_R9A07G043 · 334 unmodified lines
335 bool "RISC-V Platform support for RZ/Five"335 bool "RISC-V Platform support for RZ/Five"
336 depends on NONPORTABLE336 depends on NONPORTABLE
337 depends on RISCV_ALTERNATIVE337 depends on RISCV_ALTERNATIVE
338 depends on !RISCV_ISA_ZICBOM
338 depends on RISCV_SBI339 depends on RISCV_SBI
339 select ARCH_RZG2L340 select ARCH_RZG2L
340 select AX45MP_L2_CACHE341 select AX45MP_L2_CACHE