From: Frank Li <Frank.Li@nxp.com>
To: Vinod Koul <vkoul@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
Frank Li <Frank.Li@nxp.com>
Subject: [PATCH 3/6] dmaengine: fsl-edma: use dma_chan common config
Date: Wed, 14 Jan 2026 12:12:44 -0500 [thread overview]
Message-ID: <20260114-dma_common_config-v1-3-64feb836ff04@nxp.com> (raw)
In-Reply-To: <20260114-dma_common_config-v1-0-64feb836ff04@nxp.com>
Use common config in dma_chan.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/dma/fsl-edma-common.c | 88 +++++++++++++++++++++----------------------
drivers/dma/fsl-edma-common.h | 1 -
2 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index a592127580299681304b222d8cb383535dbcc10f..33fc4fa8d1302d899ce550b0ce5d4325fa2e3916 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -294,6 +294,7 @@ static void fsl_edma_unprep_slave_dma(struct fsl_edma_chan *fsl_chan)
static bool fsl_edma_prep_slave_dma(struct fsl_edma_chan *fsl_chan,
enum dma_transfer_direction dir)
{
+ struct dma_slave_config *cfg = &fsl_chan->vchan.chan.config;
struct device *dev = fsl_chan->vchan.chan.device->dev;
enum dma_data_direction dma_dir;
phys_addr_t addr = 0;
@@ -302,13 +303,13 @@ static bool fsl_edma_prep_slave_dma(struct fsl_edma_chan *fsl_chan,
switch (dir) {
case DMA_MEM_TO_DEV:
dma_dir = DMA_FROM_DEVICE;
- addr = fsl_chan->cfg.dst_addr;
- size = fsl_chan->cfg.dst_maxburst;
+ addr = cfg->dst_addr;
+ size = cfg->dst_maxburst;
break;
case DMA_DEV_TO_MEM:
dma_dir = DMA_TO_DEVICE;
- addr = fsl_chan->cfg.src_addr;
- size = fsl_chan->cfg.src_maxburst;
+ addr = cfg->src_addr;
+ size = cfg->src_maxburst;
break;
default:
dma_dir = DMA_NONE;
@@ -335,7 +336,6 @@ int fsl_edma_slave_config(struct dma_chan *chan,
{
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
- memcpy(&fsl_chan->cfg, cfg, sizeof(*cfg));
fsl_edma_unprep_slave_dma(fsl_chan);
return 0;
@@ -483,7 +483,7 @@ void fsl_edma_fill_tcd(struct fsl_edma_chan *fsl_chan,
u16 biter, u16 doff, dma_addr_t dlast_sga, bool major_int,
bool disable_req, bool enable_sg)
{
- struct dma_slave_config *cfg = &fsl_chan->cfg;
+ struct dma_slave_config *cfg = &fsl_chan->vchan.chan.config;
u32 burst = 0;
u16 csr = 0;
@@ -593,6 +593,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
unsigned long flags)
{
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+ struct dma_slave_config *cfg = &chan->config;
struct fsl_edma_desc *fsl_desc;
dma_addr_t dma_buf_next;
bool major_int = true;
@@ -616,21 +617,19 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
dma_buf_next = dma_addr;
if (direction == DMA_MEM_TO_DEV) {
- if (!fsl_chan->cfg.src_addr_width)
- fsl_chan->cfg.src_addr_width = fsl_chan->cfg.dst_addr_width;
+ if (!cfg->src_addr_width)
+ cfg->src_addr_width = cfg->dst_addr_width;
fsl_chan->attr =
- fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width,
- fsl_chan->cfg.dst_addr_width);
- nbytes = fsl_chan->cfg.dst_addr_width *
- fsl_chan->cfg.dst_maxburst;
+ fsl_edma_get_tcd_attr(cfg->src_addr_width,
+ cfg->dst_addr_width);
+ nbytes = cfg->dst_addr_width * cfg->dst_maxburst;
} else {
- if (!fsl_chan->cfg.dst_addr_width)
- fsl_chan->cfg.dst_addr_width = fsl_chan->cfg.src_addr_width;
+ if (!cfg->dst_addr_width)
+ cfg->dst_addr_width = cfg->src_addr_width;
fsl_chan->attr =
- fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width,
- fsl_chan->cfg.dst_addr_width);
- nbytes = fsl_chan->cfg.src_addr_width *
- fsl_chan->cfg.src_maxburst;
+ fsl_edma_get_tcd_attr(cfg->src_addr_width,
+ cfg->dst_addr_width);
+ nbytes = cfg->src_addr_width * cfg->src_maxburst;
}
iter = period_len / nbytes;
@@ -645,21 +644,21 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic(
if (direction == DMA_MEM_TO_DEV) {
src_addr = dma_buf_next;
dst_addr = fsl_chan->dma_dev_addr;
- soff = fsl_chan->cfg.dst_addr_width;
+ soff = cfg->dst_addr_width;
doff = fsl_chan->is_multi_fifo ? 4 : 0;
- if (fsl_chan->cfg.dst_port_window_size)
- doff = fsl_chan->cfg.dst_addr_width;
+ if (cfg->dst_port_window_size)
+ doff = cfg->dst_addr_width;
} else if (direction == DMA_DEV_TO_MEM) {
src_addr = fsl_chan->dma_dev_addr;
dst_addr = dma_buf_next;
soff = fsl_chan->is_multi_fifo ? 4 : 0;
- doff = fsl_chan->cfg.src_addr_width;
- if (fsl_chan->cfg.src_port_window_size)
- soff = fsl_chan->cfg.src_addr_width;
+ doff = cfg->src_addr_width;
+ if (cfg->src_port_window_size)
+ soff = cfg->src_addr_width;
} else {
/* DMA_DEV_TO_DEV */
- src_addr = fsl_chan->cfg.src_addr;
- dst_addr = fsl_chan->cfg.dst_addr;
+ src_addr = cfg->src_addr;
+ dst_addr = cfg->dst_addr;
soff = doff = 0;
major_int = false;
}
@@ -679,6 +678,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
unsigned long flags, void *context)
{
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
+ struct dma_slave_config *cfg = &chan->config;
struct fsl_edma_desc *fsl_desc;
struct scatterlist *sg;
dma_addr_t src_addr, dst_addr, last_sg;
@@ -699,38 +699,38 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
fsl_desc->dirn = direction;
if (direction == DMA_MEM_TO_DEV) {
- if (!fsl_chan->cfg.src_addr_width)
- fsl_chan->cfg.src_addr_width = fsl_chan->cfg.dst_addr_width;
+ if (!cfg->src_addr_width)
+ cfg->src_addr_width = cfg->dst_addr_width;
fsl_chan->attr =
- fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width,
- fsl_chan->cfg.dst_addr_width);
- nbytes = fsl_chan->cfg.dst_addr_width *
- fsl_chan->cfg.dst_maxburst;
+ fsl_edma_get_tcd_attr(cfg->src_addr_width,
+ cfg->dst_addr_width);
+ nbytes = cfg->dst_addr_width *
+ cfg->dst_maxburst;
} else {
- if (!fsl_chan->cfg.dst_addr_width)
- fsl_chan->cfg.dst_addr_width = fsl_chan->cfg.src_addr_width;
+ if (!cfg->dst_addr_width)
+ cfg->dst_addr_width = cfg->src_addr_width;
fsl_chan->attr =
- fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width,
- fsl_chan->cfg.dst_addr_width);
- nbytes = fsl_chan->cfg.src_addr_width *
- fsl_chan->cfg.src_maxburst;
+ fsl_edma_get_tcd_attr(cfg->src_addr_width,
+ cfg->dst_addr_width);
+ nbytes = cfg->src_addr_width *
+ cfg->src_maxburst;
}
for_each_sg(sgl, sg, sg_len, i) {
if (direction == DMA_MEM_TO_DEV) {
src_addr = sg_dma_address(sg);
dst_addr = fsl_chan->dma_dev_addr;
- soff = fsl_chan->cfg.dst_addr_width;
+ soff = cfg->dst_addr_width;
doff = 0;
} else if (direction == DMA_DEV_TO_MEM) {
src_addr = fsl_chan->dma_dev_addr;
dst_addr = sg_dma_address(sg);
soff = 0;
- doff = fsl_chan->cfg.src_addr_width;
+ doff = cfg->src_addr_width;
} else {
/* DMA_DEV_TO_DEV */
- src_addr = fsl_chan->cfg.src_addr;
- dst_addr = fsl_chan->cfg.dst_addr;
+ src_addr = cfg->src_addr;
+ dst_addr = cfg->dst_addr;
soff = 0;
doff = 0;
}
@@ -743,8 +743,8 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg(
if (sg_dma_len(sg) % nbytes) {
u32 width = (direction == DMA_DEV_TO_MEM) ? doff : soff;
u32 burst = (direction == DMA_DEV_TO_MEM) ?
- fsl_chan->cfg.src_maxburst :
- fsl_chan->cfg.dst_maxburst;
+ cfg->src_maxburst :
+ cfg->dst_maxburst;
int j;
for (j = burst; j > 1; j--) {
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 205a96489094805aa728b72a51ae101cd88fa003..8e45770a0d3960ee34361fe5884a169de64e14a7 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -166,7 +166,6 @@ struct fsl_edma_chan {
enum fsl_edma_pm_state pm_state;
struct fsl_edma_engine *edma;
struct fsl_edma_desc *edesc;
- struct dma_slave_config cfg;
u32 attr;
bool is_sw;
struct dma_pool *tcd_pool;
--
2.34.1
next prev parent reply other threads:[~2026-01-14 17:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-14 17:12 [PATCH 0/6] dmaengine: Add common dma_slave_config and split it into src and dst parts Frank Li
2026-01-14 17:12 ` [PATCH 1/6] dmaengine: Move struct dma_chan after struct dma_slave_config Frank Li
2026-01-14 17:12 ` [PATCH 2/6] dmaengine: Add common slave configuration to dma_chan Frank Li
2026-01-14 17:12 ` Frank Li [this message]
2026-01-14 17:12 ` [PATCH 4/6] dmaengine: imx-sdma: use common config at dma_chan Frank Li
2026-01-14 17:12 ` [PATCH 5/6] dmaengine: Add union and dma_slave_get_config() helper for dma_slave_config Frank Li
2026-01-14 17:12 ` [PATCH 6/6] dmaengine: fsl-edma: use common dma_slave_get_cfg() Frank Li
2026-03-09 11:24 ` [PATCH 0/6] dmaengine: Add common dma_slave_config and split it into src and dst parts Vinod Koul
2026-03-09 14:27 ` Frank Li
2026-03-17 10:26 ` Vinod Koul
2026-03-17 13:56 ` Frank Li
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=20260114-dma_common_config-v1-3-64feb836ff04@nxp.com \
--to=frank.li@nxp.com \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=vkoul@kernel.org \
/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