Commit 935da5e5 authored by Vignesh Raghavendra's avatar Vignesh Raghavendra Committed by Mark Brown

mtd: spi-nor: cadence-quadspi: Handle probe deferral while requesting DMA channel

dma_request_chan_by_mask() can throw EPROBE_DEFER if DMA provider
is not yet probed. Currently driver just falls back to using PIO mode
(which is less efficient) in this case. Instead return probe deferral
error as is so that driver will be re probed once DMA provider is
available.
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/r/20200601070444.16923-6-vigneshr@ti.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c61088d1
...@@ -1169,7 +1169,7 @@ static void cqspi_controller_init(struct cqspi_st *cqspi) ...@@ -1169,7 +1169,7 @@ static void cqspi_controller_init(struct cqspi_st *cqspi)
cqspi_controller_enable(cqspi, 1); cqspi_controller_enable(cqspi, 1);
} }
static void cqspi_request_mmap_dma(struct cqspi_st *cqspi) static int cqspi_request_mmap_dma(struct cqspi_st *cqspi)
{ {
dma_cap_mask_t mask; dma_cap_mask_t mask;
...@@ -1178,11 +1178,16 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi) ...@@ -1178,11 +1178,16 @@ static void cqspi_request_mmap_dma(struct cqspi_st *cqspi)
cqspi->rx_chan = dma_request_chan_by_mask(&mask); cqspi->rx_chan = dma_request_chan_by_mask(&mask);
if (IS_ERR(cqspi->rx_chan)) { if (IS_ERR(cqspi->rx_chan)) {
dev_err(&cqspi->pdev->dev, "No Rx DMA available\n"); int ret = PTR_ERR(cqspi->rx_chan);
if (ret != -EPROBE_DEFER)
dev_err(&cqspi->pdev->dev, "No Rx DMA available\n");
cqspi->rx_chan = NULL; cqspi->rx_chan = NULL;
return; return ret;
} }
init_completion(&cqspi->rx_dma_complete); init_completion(&cqspi->rx_dma_complete);
return 0;
} }
static const struct spi_nor_controller_ops cqspi_controller_ops = { static const struct spi_nor_controller_ops cqspi_controller_ops = {
...@@ -1269,8 +1274,11 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np) ...@@ -1269,8 +1274,11 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)
dev_dbg(nor->dev, "using direct mode for %s\n", dev_dbg(nor->dev, "using direct mode for %s\n",
mtd->name); mtd->name);
if (!cqspi->rx_chan) if (!cqspi->rx_chan) {
cqspi_request_mmap_dma(cqspi); ret = cqspi_request_mmap_dma(cqspi);
if (ret == -EPROBE_DEFER)
goto err;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment