| Message ID | 1446388901-6073-7-git-send-email-anton.bondarenko.sama@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Sun, Nov 01, 2015 at 03:41:40PM +0100, Anton Bondarenko wrote: > From: Anton Bondarenko <anton_bondarenko@mentor.com> > > 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. Maybe something like: "fix probe deferral when dmaengine is not yet available" in the subject line will better express that this is a patch that should be applied ASAP. Also you can move this up to the front of the series when resending. Sascha
On 05.11.2015 09:56, Sascha Hauer wrote: > On Sun, Nov 01, 2015 at 03:41:40PM +0100, Anton Bondarenko wrote: >> From: Anton Bondarenko <anton_bondarenko@mentor.com> >> >> 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. > > Maybe something like: "fix probe deferral when dmaengine is not yet > available" in the subject line will better express that this is a patch > that should be applied ASAP. Also you can move this up to the front of > the series when resending. > > Sascha > This patch itself does not implement deferral for spi-imx if dmaengine not ready. The patch targets 2 things: give a bit more detailed error information of SPI dma slave channel initialization error and provide a basis for the next patch ([PATCH v3 7/7] spi: imx: defer spi initialization, if DMA engine is pending). Regards, Anton -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05.11.2015 17:00, Anton Bondarenko wrote: > On 05.11.2015 09:56, Sascha Hauer wrote: >> On Sun, Nov 01, 2015 at 03:41:40PM +0100, Anton Bondarenko wrote: >>> From: Anton Bondarenko <anton_bondarenko@mentor.com> >>> >>> 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. >> >> Maybe something like: "fix probe deferral when dmaengine is not yet >> available" in the subject line will better express that this is a patch >> that should be applied ASAP. Also you can move this up to the front of >> the series when resending. >> >> Sascha >> > > This patch itself does not implement deferral for spi-imx if dmaengine > not ready. The patch targets 2 things: give a bit more detailed error > information of SPI dma slave channel initialization error and provide a > basis for the next patch ([PATCH v3 7/7] spi: imx: defer spi > initialization, if DMA engine is pending). > > Regards, Anton Does anyone has other comments regarding this commit? Regards, Anton -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05.11.2015 17:00, Anton Bondarenko wrote: > On 05.11.2015 09:56, Sascha Hauer wrote: >> On Sun, Nov 01, 2015 at 03:41:40PM +0100, Anton Bondarenko wrote: >>> From: Anton Bondarenko <anton_bondarenko@mentor.com> >>> >>> 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. >> >> Maybe something like: "fix probe deferral when dmaengine is not yet >> available" in the subject line will better express that this is a patch >> that should be applied ASAP. Also you can move this up to the front of >> the series when resending. >> >> Sascha >> > > This patch itself does not implement deferral for spi-imx if dmaengine > not ready. The patch targets 2 things: give a bit more detailed error > information of SPI dma slave channel initialization error and provide a > basis for the next patch ([PATCH v3 7/7] spi: imx: defer spi > initialization, if DMA engine is pending). > > Regards, Anton Does anyone has other comments regarding this commit? Regards, Anton -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index dc492e2..6035ddd 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -923,18 +923,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; }