From: Christoph Hellwig <hch@lst.de>
To: Conor Dooley <conor.dooley@microchip.com>
Cc: Christoph Hellwig <hch@lst.de>,
Greg Ungerer <gerg@linux-m68k.org>,
iommu@lists.linux.dev, Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Conor Dooley <conor@kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Magnus Damm <magnus.damm@gmail.com>,
Robin Murphy <robin.murphy@arm.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Wei Fang <wei.fang@nxp.com>, Shenwei Wang <shenwei.wang@nxp.com>,
Clark Wang <xiaoning.wang@nxp.com>,
NXP Linux Team <linux-imx@nxp.com>,
linux-m68k@lists.linux-m68k.org, netdev@vger.kernel.org,
linux-riscv@lists.infradead.org,
linux-renesas-soc@vger.kernel.org,
Jim Quinlan <james.quinlan@broadcom.com>
Subject: Re: [PATCH 04/12] soc: renesas: select RISCV_DMA_NONCOHERENT from ARCH_R9A07G043
Date: Mon, 16 Oct 2023 15:17:45 +0200 [thread overview]
Message-ID: <20231016131745.GB26484@lst.de> (raw)
In-Reply-To: <20231016-pantyhose-tall-7565b6b20fb9@wendy>
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.
next prev parent reply other threads:[~2023-10-16 13:17 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 5:47 fix the non-coherent coldfire dma_alloc_coherent v2 Christoph Hellwig
2023-10-16 5:47 ` [PATCH 01/12] riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT Christoph Hellwig
2023-10-16 12:49 ` Conor Dooley
2023-10-16 13:17 ` Christoph Hellwig
2023-10-16 17:16 ` Conor Dooley
2023-10-16 5:47 ` [PATCH 02/12] riscv: only select DMA_DIRECT_REMAP from RISCV_ISA_ZICBOM Christoph Hellwig
2023-10-16 11:18 ` Robin Murphy
2023-10-16 12:55 ` Conor Dooley
2023-10-16 15:39 ` Lad, Prabhakar
2023-10-16 5:47 ` [PATCH 03/12] soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM Christoph Hellwig
2023-10-16 12:53 ` Conor Dooley
2023-10-16 15:40 ` Lad, Prabhakar
2023-10-17 7:59 ` Geert Uytterhoeven
2023-10-16 5:47 ` [PATCH 04/12] soc: renesas: select RISCV_DMA_NONCOHERENT from ARCH_R9A07G043 Christoph Hellwig
2023-10-16 12:52 ` Conor Dooley
2023-10-16 13:17 ` Christoph Hellwig [this message]
2023-10-17 10:44 ` Geert Uytterhoeven
2023-10-17 12:46 ` Christoph Hellwig
2023-10-17 13:12 ` Geert Uytterhoeven
2023-10-16 15:42 ` Lad, Prabhakar
2023-10-17 8:20 ` Geert Uytterhoeven
2023-10-16 5:47 ` [PATCH 05/12] dma-direct: add depdenencies to CONFIG_DMA_GLOBAL_POOL Christoph Hellwig
2023-10-16 11:18 ` Robin Murphy
2023-10-16 15:44 ` Lad, Prabhakar
2023-10-16 5:47 ` [PATCH 06/12] dma-direct: add a CONFIG_ARCH_DMA_ALLOC symbol Christoph Hellwig
2023-10-16 11:33 ` Robin Murphy
2023-10-16 5:47 ` [PATCH 07/12] dma-direct: simplify the use atomic pool logic in dma_direct_alloc Christoph Hellwig
2023-10-16 11:58 ` Robin Murphy
2023-10-16 5:47 ` [PATCH 08/12] dma-direct: warn when coherent allocations aren't supported Christoph Hellwig
2023-10-16 11:59 ` Robin Murphy
2023-10-16 5:47 ` [PATCH 09/12] m68k: use the coherent DMA code for coldfire without data cache Christoph Hellwig
2023-10-17 8:40 ` Geert Uytterhoeven
2023-10-19 12:50 ` Greg Ungerer
2023-10-16 5:47 ` [PATCH 10/12] net: fec: use dma_alloc_noncoherent for data cache enabled coldfire Christoph Hellwig
2023-10-17 8:43 ` Geert Uytterhoeven
2023-10-16 5:47 ` [PATCH 11/12] m68k: don't provide arch_dma_alloc for nommu/coldfire Christoph Hellwig
2023-10-16 5:47 ` [PATCH 12/12] m68k: remove unused includes from dma.c Christoph Hellwig
2023-10-17 8:48 ` Geert Uytterhoeven
2023-10-19 13:09 ` fix the non-coherent coldfire dma_alloc_coherent v2 Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231016131745.GB26484@lst.de \
--to=hch@lst.de \
--cc=conor.dooley@microchip.com \
--cc=conor@kernel.org \
--cc=geert+renesas@glider.be \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=iommu@lists.linux.dev \
--cc=james.quinlan@broadcom.com \
--cc=linux-imx@nxp.com \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=magnus.damm@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robin.murphy@arm.com \
--cc=shenwei.wang@nxp.com \
--cc=wei.fang@nxp.com \
--cc=xiaoning.wang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).