| Message ID | 20231016054755.915155-5-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | [01/12] riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT | expand |
On Mon, Oct 16, 2023 at 07:47:46AM +0200, Christoph Hellwig wrote: > Selecting DMA_GLOBAL_POOL without the rest of the non-coherent DMA > infrastructure does not make sense. > > 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 f1696d3b5018d0..ea473b4150dfa8 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -338,6 +338,7 @@ config ARCH_R9A07G043 > select ARCH_RZG2L > select AX45MP_L2_CACHE > select DMA_GLOBAL_POOL > + select RISCV_DMA_NONCOHERENT > select ERRATA_ANDES if RISCV_SBI > select ERRATA_ANDES_CMO if ERRATA_ANDES Since this Kconfig menu has changed a bit in linux-next, the selects are unconditional here, and ERRATA_ANDES_CMO will in turn select RISCV_DMA_NONCOHERENT. I don't think being more explicit hurts anyone though, so Acked-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor.
On Mon, Oct 16, 2023 at 01:52:57PM +0100, Conor Dooley wrote: > > + select RISCV_DMA_NONCOHERENT > > select ERRATA_ANDES if RISCV_SBI > > select ERRATA_ANDES_CMO if ERRATA_ANDES > > Since this Kconfig menu has changed a bit in linux-next, the selects > are unconditional here, and ERRATA_ANDES_CMO will in turn select > RISCV_DMA_NONCOHERENT. Oh, looks like another patch landed there in linux-next. I had waited for the previous one go go upstream in -rc6. Not sure how to best handle this conflict.
On Mon, Oct 16, 2023 at 6:48 AM Christoph Hellwig <hch@lst.de> wrote: > > Selecting DMA_GLOBAL_POOL without the rest of the non-coherent DMA > infrastructure does not make sense. > > 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 f1696d3b5018d0..ea473b4150dfa8 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -338,6 +338,7 @@ config ARCH_R9A07G043 > select ARCH_RZG2L > select AX45MP_L2_CACHE > select DMA_GLOBAL_POOL > + select RISCV_DMA_NONCOHERENT Can we keep this alphabetical sorted please, with that fixed: Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Cheers, Prabhakar > select ERRATA_ANDES if RISCV_SBI > select ERRATA_ANDES_CMO if ERRATA_ANDES > > -- > 2.39.2 >
On Mon, Oct 16, 2023 at 7:48 AM Christoph Hellwig <hch@lst.de> wrote: > Selecting DMA_GLOBAL_POOL without the rest of the non-coherent DMA > infrastructure does not make sense. > > 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 f1696d3b5018d0..ea473b4150dfa8 100644 > --- a/drivers/soc/renesas/Kconfig > +++ b/drivers/soc/renesas/Kconfig > @@ -338,6 +338,7 @@ config ARCH_R9A07G043 > select ARCH_RZG2L > select AX45MP_L2_CACHE > select DMA_GLOBAL_POOL > + select RISCV_DMA_NONCOHERENT > select ERRATA_ANDES if RISCV_SBI > select ERRATA_ANDES_CMO if ERRATA_ANDES With proper sort order, and rebased to soc/for-next: Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
Hi Christoph, On Mon, Oct 16, 2023 at 3:17 PM Christoph Hellwig <hch@lst.de> wrote: > On Mon, Oct 16, 2023 at 01:52:57PM +0100, Conor Dooley wrote: > > > + select RISCV_DMA_NONCOHERENT > > > select ERRATA_ANDES if RISCV_SBI > > > select ERRATA_ANDES_CMO if ERRATA_ANDES > > > > Since this Kconfig menu has changed a bit in linux-next, the selects > > are unconditional here, and ERRATA_ANDES_CMO will in turn select > > RISCV_DMA_NONCOHERENT. > > Oh, looks like another patch landed there in linux-next. I had > waited for the previous one go go upstream in -rc6. Not sure > how to best handle this conflict. I think the easiest is to ask soc to apply this series? Gr{oetje,eeting}s, Geert
On Tue, Oct 17, 2023 at 12:44:41PM +0200, Geert Uytterhoeven wrote: > Hi Christoph, > > On Mon, Oct 16, 2023 at 3:17 PM Christoph Hellwig <hch@lst.de> wrote: > > On Mon, Oct 16, 2023 at 01:52:57PM +0100, Conor Dooley wrote: > > > > + select RISCV_DMA_NONCOHERENT > > > > select ERRATA_ANDES if RISCV_SBI > > > > select ERRATA_ANDES_CMO if ERRATA_ANDES > > > > > > Since this Kconfig menu has changed a bit in linux-next, the selects > > > are unconditional here, and ERRATA_ANDES_CMO will in turn select > > > RISCV_DMA_NONCOHERENT. > > > > Oh, looks like another patch landed there in linux-next. I had > > waited for the previous one go go upstream in -rc6. Not sure > > how to best handle this conflict. > > I think the easiest is to ask soc to apply this series? I don't think pulling all the DMA bits into a random other tree would be a good idea. I can hand off the first few bits, but I'd need a stable branch to pull in after that. Which of the half a dozen soc trees we have in linux-next is this anyway?
Hi Christoph, On Tue, Oct 17, 2023 at 2:46 PM Christoph Hellwig <hch@lst.de> wrote: > On Tue, Oct 17, 2023 at 12:44:41PM +0200, Geert Uytterhoeven wrote: > > On Mon, Oct 16, 2023 at 3:17 PM Christoph Hellwig <hch@lst.de> wrote: > > > On Mon, Oct 16, 2023 at 01:52:57PM +0100, Conor Dooley wrote: > > > > > + select RISCV_DMA_NONCOHERENT > > > > > select ERRATA_ANDES if RISCV_SBI > > > > > select ERRATA_ANDES_CMO if ERRATA_ANDES > > > > > > > > Since this Kconfig menu has changed a bit in linux-next, the selects > > > > are unconditional here, and ERRATA_ANDES_CMO will in turn select > > > > RISCV_DMA_NONCOHERENT. > > > > > > Oh, looks like another patch landed there in linux-next. I had > > > waited for the previous one go go upstream in -rc6. Not sure > > > how to best handle this conflict. > > > > I think the easiest is to ask soc to apply this series? > > I don't think pulling all the DMA bits into a random other tree > would be a good idea. I can hand off the first few bits, but I'd > need a stable branch to pull in after that. Which of the half a dozen > soc trees we have in linux-next is this anyway? The one and only https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git/ Gr{oetje,eeting}s, Geert
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index f1696d3b5018d0..ea473b4150dfa8 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -338,6 +338,7 @@ config ARCH_R9A07G043 select ARCH_RZG2L select AX45MP_L2_CACHE select DMA_GLOBAL_POOL + select RISCV_DMA_NONCOHERENT select ERRATA_ANDES if RISCV_SBI select ERRATA_ANDES_CMO if ERRATA_ANDES
Selecting DMA_GLOBAL_POOL without the rest of the non-coherent DMA infrastructure does not make sense. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/soc/renesas/Kconfig | 1 + 1 file changed, 1 insertion(+)