Unverified Commit 736a4aad authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-fixes-for-v6.6-tag3' of... 

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

Link: https://lore.kernel.org/r/cover.1698312384.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 291c0d3a 9eab43fa

arch/riscv/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -273,11 +273,9 @@ config RISCV_DMA_NONCOHERENT 
	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select DMA_BOUNCE_UNALIGNED_KMALLOC if SWIOTLB

	select DMA_DIRECT_REMAP if MMU



config RISCV_NONSTANDARD_CACHE_OPS

	bool

	depends on RISCV_DMA_NONCOHERENT

	help

	  This enables function pointer support for non-standard noncoherent

	  systems to handle cache management.
@@ -550,6 +548,7 @@ config RISCV_ISA_ZICBOM 
	depends on RISCV_ALTERNATIVE

	default y

	select RISCV_DMA_NONCOHERENT

	select DMA_DIRECT_REMAP

	help

	   Adds support to dynamically detect the presence of the ZICBOM

	   extension (Cache Block Management Operations) and enable its

arch/riscv/Kconfig.errata

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ config ERRATA_THEAD_PBMT 
config ERRATA_THEAD_CMO

	bool "Apply T-Head cache management errata"

	depends on ERRATA_THEAD && MMU

	select DMA_DIRECT_REMAP

	select RISCV_DMA_NONCOHERENT

	default y

	help

drivers/cache/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ menu "Cache Drivers" 


config AX45MP_L2_CACHE

	bool "Andes Technology AX45MP L2 Cache controller"

	depends on RISCV_DMA_NONCOHERENT

	depends on RISCV

	select RISCV_NONSTANDARD_CACHE_OPS

	help

	  Support for the L2 cache controller on Andes Technology AX45MP platforms.

drivers/soc/renesas/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ config ARCH_R9A07G043 
	bool "RISC-V Platform support for RZ/Five"

	depends on NONPORTABLE

	depends on RISCV_ALTERNATIVE

	depends on !RISCV_ISA_ZICBOM

	depends on RISCV_SBI

	select ARCH_RZG2L

	select AX45MP_L2_CACHE