From: Robin Gong <b38343@freescale.com>
To: Anton Bondarenko <anton_bondarenko@mentor.com>
Cc: <broonie@kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-spi@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <jiada_wang@mentor.com>,
<muzaffar_mahmood@relay1.mentorg.com>,
<vladimir_zapolskiy@mentor.com>
Subject: Re: [PATCH v2 6/8] spi: imx: return error from dma channel request
Date: Wed, 30 Sep 2015 16:51:59 +0800 [thread overview]
Message-ID: <20150930085158.GF2709@shlinux2> (raw)
In-Reply-To: <2d4cc8c07de8e90b76763d2c40aea57c598ee1a1.1442923630.git.anton_bondarenko@mentor.com>
On Fri, Sep 25, 2015 at 07:57:13PM +0200, Anton Bondarenko wrote:
> On SDMA initialization return exactly the same error, which is
> reported by dma_request_slave_channel_reason(), it is a preceding
> change to defer SPI DMA initialization, if SDMA module is not yet
> available.
>
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
> Signed-off-by: Anton Bondarenko <anton_bondarenko@mentor.com>
> ---
> drivers/spi/spi-imx.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index 4b3c16e..44d3cf0 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -929,18 +929,20 @@ static int spi_imx_sdma_init(struct device *dev, struct spi_imx_data *spi_imx,
> spi_imx->wml = spi_imx_get_fifosize(spi_imx) / 2;
>
> /* Prepare for TX DMA: */
> - master->dma_tx = dma_request_slave_channel(dev, "tx");
> - if (!master->dma_tx) {
> - dev_err(dev, "cannot get the TX DMA channel!\n");
> - ret = -EINVAL;
> + master->dma_tx = dma_request_slave_channel_reason(dev, "tx");
> + if (IS_ERR(master->dma_tx)) {
> + dev_info(dev, "cannot get the TX DMA channel!\n");
> + ret = PTR_ERR(master->dma_tx);
> + master->dma_tx = NULL;
> goto err;
> }
>
> /* Prepare for RX : */
> - master->dma_rx = dma_request_slave_channel(dev, "rx");
> - if (!master->dma_rx) {
> - dev_dbg(dev, "cannot get the DMA channel.\n");
> - ret = -EINVAL;
> + master->dma_rx = dma_request_slave_channel_reason(dev, "rx");
> + if (IS_ERR(master->dma_rx)) {
> + dev_info(dev, "cannot get the DMA channel.\n");
> + ret = PTR_ERR(master->dma_rx);
> + master->dma_rx = NULL;
> goto err;
> }
>
> --
> 2.5.2
>
next prev parent reply other threads:[~2015-09-30 8:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-25 17:57 [PATCH v2 0/8] Improvements for SPI IMX driver for Freescale IMX53 and IMX6 families Anton Bondarenko
2015-09-25 17:57 ` [PATCH v2 1/8] spi: imx: Fix DMA transfer Anton Bondarenko
2015-09-28 3:48 ` kbuild test robot
[not found] ` <d61ed8cc9e13b0890e6243135c613edea1234698.1442923630.git.anton_bondarenko-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
2015-09-30 8:23 ` Robin Gong
2015-10-01 0:02 ` Bondarenko, Anton
2015-10-08 9:19 ` Robin Gong
2015-10-20 23:03 ` Anton Bondarenko
2015-09-25 17:57 ` [PATCH v2 2/8] spi: imx: replace fixed timeout with calculated one Anton Bondarenko
2015-09-30 8:31 ` Robin Gong
2015-10-01 0:08 ` Bondarenko, Anton
2015-09-25 17:57 ` [PATCH v2 3/8] spi: imx: add support for all SPI word width for DMA transfer Anton Bondarenko
2015-09-30 8:35 ` Robin Gong
2015-10-01 0:34 ` Bondarenko, Anton
2015-10-08 9:51 ` Robin Gong
2015-10-20 23:28 ` Anton Bondarenko
2015-09-25 17:57 ` [PATCH v2 4/8] spi: imx: add selection for iMX53 and iMX6 controller type Anton Bondarenko
2015-09-25 17:57 ` [PATCH v2 5/8] spi: imx: Add support for loopback for ECSPI controllers Anton Bondarenko
2015-09-30 8:42 ` Robin Gong
2015-10-01 0:16 ` Bondarenko, Anton
[not found] ` <04376A3D786BD947B28569C998A374A62E280E0F-0dz9ie/QGrkPOGHby5MvPNQH9K4/4qFeAL8bYrjMMd8@public.gmane.org>
2015-10-08 9:28 ` Robin Gong
2015-10-20 23:08 ` Anton Bondarenko
2015-09-25 17:57 ` [PATCH v2 6/8] spi: imx: return error from dma channel request Anton Bondarenko
2015-09-30 8:51 ` Robin Gong [this message]
2015-09-25 17:57 ` [PATCH v2 7/8] spi: imx: defer spi initialization, if DMA engine is pending Anton Bondarenko
2015-09-30 8:54 ` Robin Gong
[not found] ` <cover.1442923630.git.anton_bondarenko-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>
2015-09-25 17:57 ` [PATCH v2 8/8] spi: imx: Add support for SPI Slave mode for imx53 and imx6 chips Anton Bondarenko
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=20150930085158.GF2709@shlinux2 \
--to=b38343@freescale.com \
--cc=anton_bondarenko@mentor.com \
--cc=broonie@kernel.org \
--cc=jiada_wang@mentor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=muzaffar_mahmood@relay1.mentorg.com \
--cc=vladimir_zapolskiy@mentor.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).