From: Fabrice Gasnier <fabrice.gasnier@st.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>, <lee.jones@linaro.org>,
<mcoquelin.stm32@gmail.com>, <alexandre.torgue@st.com>
Cc: <vkoul@kernel.org>, <linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] mfd: stm32-timers: Use dma_request_chan() instead dma_request_slave_channel()
Date: Tue, 7 Jan 2020 18:04:52 +0100 [thread overview]
Message-ID: <af1040f5-4377-1466-7d82-b62004fedab8@st.com> (raw)
In-Reply-To: <20200107105959.18920-1-peter.ujfalusi@ti.com>
On 1/7/20 11:59 AM, Peter Ujfalusi wrote:
> dma_request_slave_channel() is a wrapper on top of dma_request_chan()
> eating up the error code.
>
> By using dma_request_chan() directly the driver can support deferred
> probing against DMA.
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
> Hi,
>
> Changes since v1:
> - Fall back to PIO mode only in case of ENODEV and report all other errors
>
> Regards,
> Peter
Hi Peter,
Thanks for the patch,
Acked-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Best Regards,
Fabrice
>
> drivers/mfd/stm32-timers.c | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mfd/stm32-timers.c b/drivers/mfd/stm32-timers.c
> index efcd4b980c94..add603359124 100644
> --- a/drivers/mfd/stm32-timers.c
> +++ b/drivers/mfd/stm32-timers.c
> @@ -167,10 +167,11 @@ static void stm32_timers_get_arr_size(struct stm32_timers *ddata)
> regmap_write(ddata->regmap, TIM_ARR, 0x0);
> }
>
> -static void stm32_timers_dma_probe(struct device *dev,
> +static int stm32_timers_dma_probe(struct device *dev,
> struct stm32_timers *ddata)
> {
> int i;
> + int ret = 0;
> char name[4];
>
> init_completion(&ddata->dma.completion);
> @@ -179,14 +180,23 @@ static void stm32_timers_dma_probe(struct device *dev,
> /* Optional DMA support: get valid DMA channel(s) or NULL */
> for (i = STM32_TIMERS_DMA_CH1; i <= STM32_TIMERS_DMA_CH4; i++) {
> snprintf(name, ARRAY_SIZE(name), "ch%1d", i + 1);
> - ddata->dma.chans[i] = dma_request_slave_channel(dev, name);
> + ddata->dma.chans[i] = dma_request_chan(dev, name);
> }
> - ddata->dma.chans[STM32_TIMERS_DMA_UP] =
> - dma_request_slave_channel(dev, "up");
> - ddata->dma.chans[STM32_TIMERS_DMA_TRIG] =
> - dma_request_slave_channel(dev, "trig");
> - ddata->dma.chans[STM32_TIMERS_DMA_COM] =
> - dma_request_slave_channel(dev, "com");
> + ddata->dma.chans[STM32_TIMERS_DMA_UP] = dma_request_chan(dev, "up");
> + ddata->dma.chans[STM32_TIMERS_DMA_TRIG] = dma_request_chan(dev, "trig");
> + ddata->dma.chans[STM32_TIMERS_DMA_COM] = dma_request_chan(dev, "com");
> +
> + for (i = STM32_TIMERS_DMA_CH1; i < STM32_TIMERS_MAX_DMAS; i++) {
> + if (IS_ERR(ddata->dma.chans[i])) {
> + /* Save the first error code to return */
> + if (PTR_ERR(ddata->dma.chans[i]) != -ENODEV && !ret)
> + ret = PTR_ERR(ddata->dma.chans[i]);
> +
> + ddata->dma.chans[i] = NULL;
> + }
> + }
> +
> + return ret;
> }
>
> static void stm32_timers_dma_remove(struct device *dev,
> @@ -230,7 +240,11 @@ static int stm32_timers_probe(struct platform_device *pdev)
>
> stm32_timers_get_arr_size(ddata);
>
> - stm32_timers_dma_probe(dev, ddata);
> + ret = stm32_timers_dma_probe(dev, ddata);
> + if (ret) {
> + stm32_timers_dma_remove(dev, ddata);
> + return ret;
> + }
>
> platform_set_drvdata(pdev, ddata);
>
>
next prev parent reply other threads:[~2020-01-07 17:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 10:59 [PATCH v2] mfd: stm32-timers: Use dma_request_chan() instead dma_request_slave_channel() Peter Ujfalusi
2020-01-07 17:04 ` Fabrice Gasnier [this message]
2020-04-16 8:46 ` Lee Jones
2020-05-12 14:04 ` Peter Ujfalusi
2020-05-20 8:49 ` Lee Jones
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=af1040f5-4377-1466-7d82-b62004fedab8@st.com \
--to=fabrice.gasnier@st.com \
--cc=alexandre.torgue@st.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=peter.ujfalusi@ti.com \
--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;
as well as URLs for NNTP newsgroup(s).