From: Frank.Li@oss.nxp.com
To: "Eugen Hristev" <ehristev@kernel.org>,
"Jonathan Cameron" <jic23@kernel.org>,
"David Lechner" <dlechner@baylibre.com>,
"Nuno Sá" <nuno.sa@analog.com>,
"Andy Shevchenko" <andy@kernel.org>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
"Daniel Lezcano" <daniel.lezcano@kernel.org>,
"Felix Gu" <ustc.gu@gmail.com>,
"Stepan Ionichev" <sozdayvek@gmail.com>,
"Shuvam Pandey" <shuvampandey1@gmail.com>,
"Antoniu Miclaus" <antoniu.miclaus@analog.com>,
"Frank Li" <Frank.Li@nxp.com>,
"Piyush Patle" <piyushpatle228@gmail.com>,
"Uwe Kleine-König (The Capable Hub)"
<u.kleine-koenig@baylibre.com>,
"Takashi Sakamoto" <o-takashi@sakamocchi.jp>,
"Giorgi Tchankvetadze" <giorgitchankvetadze1997@gmail.com>,
"Olivier Moysan" <olivier.moysan@foss.st.com>,
"Rob Herring (Arm)" <robh@kernel.org>,
"Pei Xiao" <xiaopei01@kylinos.cn>,
"Shi Hao" <i.shihao.999@gmail.com>,
"Kees Cook" <kees+treewide@kernel.org>,
"Michael Hennerich" <michael.hennerich@analog.com>,
linux-iio@vger.kernel.org (open list:MICROCHIP
SAMA5D2-COMPATIBLE ADC DRIVER),
linux-arm-kernel@lists.infradead.org (moderated
list:ARM/Microchip (AT91) SoC support),
linux-kernel@vger.kernel.org (open list),
linux-stm32@st-md-mailman.stormreply.com (moderated
list:ARM/STM32 ARCHITECTURE)
Cc: imx@lists.linux.dev, vkoul@kernel.org
Subject: [PATCH 1/1] iio: use dmaengine_get_dma_device() instead of chan->device->dev
Date: Thu, 17 Sep 2026 16:36:26 -0400 [thread overview]
Message-ID: <20260917203652.1279059-1-Frank.Li@oss.nxp.com> (raw)
From: Frank Li <Frank.Li@nxp.com>
Replace direct dma_chan::device::dev access with the proper
dmaengine_get_dma_device() accessor in IIO DMA consumers.
chan->device->dev is not always the device used for DMA mapping.
Some DMA engines support per-channel IOMMU mappings, so different
channels may use different DMA devices. dmaengine_get_dma_device()
returns the correct device for each channel.
This also prepares for making the DMA engine provider data structures
private. DMA consumers should not access DMA engine internals directly.
Assisted-by: LLM
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Cc: imx@lists.linux.dev
Cc: vkoul@kernel.org
---
drivers/iio/adc/at91-sama5d2_adc.c | 9 ++++++---
drivers/iio/adc/nxp-sar-adc.c | 2 +-
drivers/iio/adc/stm32-adc.c | 10 ++++++----
drivers/iio/adc/stm32-dfsdm-adc.c | 4 ++--
drivers/iio/adc/ti_am335x_adc.c | 4 ++--
drivers/iio/buffer/industrialio-buffer-dmaengine.c | 5 +++--
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index e8a5285bb6d4f..0e7d07fb27ca7 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -2016,6 +2016,8 @@ static void at91_adc_dma_init(struct at91_adc_state *st)
unsigned int pages = DIV_ROUND_UP(AT91_HWFIFO_MAX_SIZE *
sample_size * 2, PAGE_SIZE);
+ struct device *dma_dev;
+
if (st->dma_st.dma_chan)
return;
@@ -2026,7 +2028,8 @@ static void at91_adc_dma_init(struct at91_adc_state *st)
goto dma_exit;
}
- st->dma_st.rx_buf = dma_alloc_coherent(st->dma_st.dma_chan->device->dev,
+ dma_dev = dmaengine_get_dma_device(st->dma_st.dma_chan);
+ st->dma_st.rx_buf = dma_alloc_coherent(dma_dev,
pages * PAGE_SIZE,
&st->dma_st.rx_dma_buf,
GFP_KERNEL);
@@ -2054,7 +2057,7 @@ static void at91_adc_dma_init(struct at91_adc_state *st)
return;
dma_free_area:
- dma_free_coherent(st->dma_st.dma_chan->device->dev, pages * PAGE_SIZE,
+ dma_free_coherent(dma_dev, pages * PAGE_SIZE,
st->dma_st.rx_buf, st->dma_st.rx_dma_buf);
dma_chan_disable:
dma_release_channel(st->dma_st.dma_chan);
@@ -2078,7 +2081,7 @@ static void at91_adc_dma_disable(struct at91_adc_state *st)
/* wait for all transactions to be terminated first*/
dmaengine_terminate_sync(st->dma_st.dma_chan);
- dma_free_coherent(st->dma_st.dma_chan->device->dev, pages * PAGE_SIZE,
+ dma_free_coherent(dmaengine_get_dma_device(st->dma_st.dma_chan), pages * PAGE_SIZE,
st->dma_st.rx_buf, st->dma_st.rx_dma_buf);
dma_release_channel(st->dma_st.dma_chan);
st->dma_st.dma_chan = NULL;
diff --git a/drivers/iio/adc/nxp-sar-adc.c b/drivers/iio/adc/nxp-sar-adc.c
index 894d3211b2838..2f716a2f97b80 100644
--- a/drivers/iio/adc/nxp-sar-adc.c
+++ b/drivers/iio/adc/nxp-sar-adc.c
@@ -604,7 +604,7 @@ static void nxp_sar_adc_dma_cb(void *data)
dma_buf = &info->dma_buf;
dma_samples = (u32 *)dma_buf->buf;
- dev_dma = info->dma_chan->device->dev;
+ dev_dma = dmaengine_get_dma_device(info->dma_chan);
/*
* DMA in some corner cases might have already be charged for
diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c
index 5c6c06b269be6..6aa672177970a 100644
--- a/drivers/iio/adc/stm32-adc.c
+++ b/drivers/iio/adc/stm32-adc.c
@@ -2456,6 +2456,7 @@ static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)
{
struct stm32_adc *adc = iio_priv(indio_dev);
struct dma_slave_config config = { };
+ struct device *dma_dev;
int ret;
adc->dma_chan = dma_request_chan(dev, "rx");
@@ -2470,7 +2471,8 @@ static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)
return 0;
}
- adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev,
+ dma_dev = dmaengine_get_dma_device(adc->dma_chan);
+ adc->rx_buf = dma_alloc_coherent(dma_dev,
STM32_DMA_BUFFER_SIZE,
&adc->rx_dma_buf, GFP_KERNEL);
if (!adc->rx_buf) {
@@ -2490,7 +2492,7 @@ static int stm32_adc_dma_request(struct device *dev, struct iio_dev *indio_dev)
return 0;
err_free:
- dma_free_coherent(adc->dma_chan->device->dev, STM32_DMA_BUFFER_SIZE,
+ dma_free_coherent(dma_dev, STM32_DMA_BUFFER_SIZE,
adc->rx_buf, adc->rx_dma_buf);
err_release:
dma_release_channel(adc->dma_chan);
@@ -2617,7 +2619,7 @@ static int stm32_adc_probe(struct platform_device *pdev)
err_dma_disable:
if (adc->dma_chan) {
- dma_free_coherent(adc->dma_chan->device->dev,
+ dma_free_coherent(dmaengine_get_dma_device(adc->dma_chan),
STM32_DMA_BUFFER_SIZE,
adc->rx_buf, adc->rx_dma_buf);
dma_release_channel(adc->dma_chan);
@@ -2640,7 +2642,7 @@ static void stm32_adc_remove(struct platform_device *pdev)
pm_runtime_put_noidle(&pdev->dev);
iio_triggered_buffer_cleanup(indio_dev);
if (adc->dma_chan) {
- dma_free_coherent(adc->dma_chan->device->dev,
+ dma_free_coherent(dmaengine_get_dma_device(adc->dma_chan),
STM32_DMA_BUFFER_SIZE,
adc->rx_buf, adc->rx_dma_buf);
dma_release_channel(adc->dma_chan);
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index 00f05e167afc9..674767da3ac37 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -1484,7 +1484,7 @@ static void stm32_dfsdm_dma_release(struct iio_dev *indio_dev)
struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);
if (adc->dma_chan) {
- dma_free_coherent(adc->dma_chan->device->dev,
+ dma_free_coherent(dmaengine_get_dma_device(adc->dma_chan),
DFSDM_DMA_BUFFER_SIZE,
adc->rx_buf, adc->dma_buf);
dma_release_channel(adc->dma_chan);
@@ -1504,7 +1504,7 @@ static int stm32_dfsdm_dma_request(struct device *dev,
return ret;
}
- adc->rx_buf = dma_alloc_coherent(adc->dma_chan->device->dev,
+ adc->rx_buf = dma_alloc_coherent(dmaengine_get_dma_device(adc->dma_chan),
DFSDM_DMA_BUFFER_SIZE,
&adc->dma_buf, GFP_KERNEL);
if (!adc->rx_buf) {
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 1516dd332f905..e53c839e87ef3 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -548,7 +548,7 @@ static int tiadc_request_dma(struct platform_device *pdev,
}
/* RX buffer */
- dma->buf = dma_alloc_coherent(dma->chan->device->dev, DMA_BUFFER_SIZE,
+ dma->buf = dma_alloc_coherent(dmaengine_get_dma_device(dma->chan), DMA_BUFFER_SIZE,
&dma->addr, GFP_KERNEL);
if (!dma->buf)
goto err;
@@ -688,7 +688,7 @@ static void tiadc_remove(struct platform_device *pdev)
u32 step_en;
if (dma->chan) {
- dma_free_coherent(dma->chan->device->dev, DMA_BUFFER_SIZE,
+ dma_free_coherent(dmaengine_get_dma_device(dma->chan), DMA_BUFFER_SIZE,
dma->buf, dma->addr);
dma_release_channel(dma->chan);
}
diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
index 559880e0cad72..b9f8b5b3aa6b6 100644
--- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c
+++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
@@ -254,6 +254,7 @@ static const struct iio_dev_attr *iio_dmaengine_buffer_attrs[] = {
*/
static struct iio_buffer *iio_dmaengine_buffer_alloc(struct dma_chan *chan)
{
+ struct device *dma_dev = dmaengine_get_dma_device(chan);
struct dmaengine_buffer *dmaengine_buffer;
unsigned int width, src_width, dest_width;
struct dma_slave_caps caps;
@@ -281,9 +282,9 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct dma_chan *chan)
INIT_LIST_HEAD(&dmaengine_buffer->active);
dmaengine_buffer->chan = chan;
dmaengine_buffer->align = width;
- dmaengine_buffer->max_size = dma_get_max_seg_size(chan->device->dev);
+ dmaengine_buffer->max_size = dma_get_max_seg_size(dma_dev);
- iio_dma_buffer_init(&dmaengine_buffer->queue, chan->device->dev,
+ iio_dma_buffer_init(&dmaengine_buffer->queue, dma_dev,
&iio_dmaengine_default_ops);
dmaengine_buffer->queue.buffer.attrs = iio_dmaengine_buffer_attrs;
--
2.43.0
next reply other threads:[~2026-09-17 20:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-17 20:36 Frank.Li [this message]
2026-09-18 6:47 ` Andy Shevchenko
2026-09-18 17:54 ` Vinod Koul
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=20260917203652.1279059-1-Frank.Li@oss.nxp.com \
--to=frank.li@oss.nxp.com \
--cc=Frank.Li@nxp.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@foss.st.com \
--cc=andy@kernel.org \
--cc=antoniu.miclaus@analog.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=daniel.lezcano@kernel.org \
--cc=dlechner@baylibre.com \
--cc=ehristev@kernel.org \
--cc=giorgitchankvetadze1997@gmail.com \
--cc=i.shihao.999@gmail.com \
--cc=imx@lists.linux.dev \
--cc=jic23@kernel.org \
--cc=kees+treewide@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=michael.hennerich@analog.com \
--cc=nicolas.ferre@microchip.com \
--cc=nuno.sa@analog.com \
--cc=o-takashi@sakamocchi.jp \
--cc=olivier.moysan@foss.st.com \
--cc=piyushpatle228@gmail.com \
--cc=robh@kernel.org \
--cc=shuvampandey1@gmail.com \
--cc=sozdayvek@gmail.com \
--cc=u.kleine-koenig@baylibre.com \
--cc=ustc.gu@gmail.com \
--cc=vkoul@kernel.org \
--cc=xiaopei01@kylinos.cn \
/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
all inboxes | Powered by JetHome®