| Message ID | 20231016054755.915155-4-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/12] riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Mon, Oct 16, 2023 at 07:47:45AM +0200, Christoph Hellwig wrote: > ARCH_R9A07G043 has it's own non-standard global pool based DMA coherent > allocator, which conflicts with the remap based RISCV_ISA_ZICBOM version. > Add a proper dependency. Acked-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/soc/renesas/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig > index 880c544bb2dfda..f1696d3b5018d0 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -334,6 +334,7 @@ if RISCV > config ARCH_R9A07G043 > bool "RISC-V Platform support for RZ/Five" > depends on NONPORTABLE > + depends on !RISCV_ISA_ZICBOM > select ARCH_RZG2L > select AX45MP_L2_CACHE > select DMA_GLOBAL_POOL > -- > 2.39.2 >
On Mon, Oct 16, 2023 at 6:48 AM Christoph Hellwig <hch@lst.de> wrote: > > ARCH_R9A07G043 has it's own non-standard global pool based DMA coherent > allocator, which conflicts with the remap based RISCV_ISA_ZICBOM version. > Add a proper dependency. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/soc/renesas/Kconfig | 1 + > 1 file changed, 1 insertion(+) > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Cheers, Prabhakar > diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig > index 880c544bb2dfda..f1696d3b5018d0 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -334,6 +334,7 @@ if RISCV > config ARCH_R9A07G043 > bool "RISC-V Platform support for RZ/Five" > depends on NONPORTABLE > + depends on !RISCV_ISA_ZICBOM > select ARCH_RZG2L > select AX45MP_L2_CACHE > select DMA_GLOBAL_POOL > -- > 2.39.2 >
On Mon, Oct 16, 2023 at 7:48 AM Christoph Hellwig <hch@lst.de> wrote: > ARCH_R9A07G043 has it's own non-standard global pool based DMA coherent its > allocator, which conflicts with the remap based RISCV_ISA_ZICBOM version. > Add a proper dependency. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index 880c544bb2dfda..f1696d3b5018d0 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -334,6 +334,7 @@ if RISCV config ARCH_R9A07G043 bool "RISC-V Platform support for RZ/Five" depends on NONPORTABLE + depends on !RISCV_ISA_ZICBOM select ARCH_RZG2L select AX45MP_L2_CACHE select DMA_GLOBAL_POOL
ARCH_R9A07G043 has it's own non-standard global pool based DMA coherent allocator, which conflicts with the remap based RISCV_ISA_ZICBOM version. Add a proper dependency. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/soc/renesas/Kconfig | 1 + 1 file changed, 1 insertion(+)