diff mbox series

spi: tegra210-quad: Don't initialise DMA if not supported

Message ID 20221026155633.141792-1-jonathanh@nvidia.com (mailing list archive)
State Accepted
Commit ae4b3c1252f0fd0951d2f072a02ba46cac8d6c92
Headers show
Series spi: tegra210-quad: Don't initialise DMA if not supported | expand

Commit Message

Jon Hunter Oct. 26, 2022, 3:56 p.m. UTC
The following error messages are observed on boot for Tegra234 ...

 ERR KERN tegra-qspi 3270000.spi: cannot use DMA: -19
 ERR KERN tegra-qspi 3270000.spi: falling back to PIO

Tegra234 does not support DMA for the QSPI and so initialising the DMA
is expected to fail. The above error messages are misleading for devices
that don't support DMA and so fix this by skipping the DMA
initialisation for devices that don't support DMA.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/spi/spi-tegra210-quad.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Thierry Reding Oct. 28, 2022, 11:22 a.m. UTC | #1
On Wed, Oct 26, 2022 at 04:56:33PM +0100, Jon Hunter wrote:
> The following error messages are observed on boot for Tegra234 ...
> 
>  ERR KERN tegra-qspi 3270000.spi: cannot use DMA: -19
>  ERR KERN tegra-qspi 3270000.spi: falling back to PIO
> 
> Tegra234 does not support DMA for the QSPI and so initialising the DMA
> is expected to fail. The above error messages are misleading for devices
> that don't support DMA and so fix this by skipping the DMA
> initialisation for devices that don't support DMA.
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/spi/spi-tegra210-quad.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Acked-by: Thierry Reding <treding@nvidia.com>
Mark Brown Oct. 28, 2022, 6:41 p.m. UTC | #2
On Wed, 26 Oct 2022 16:56:33 +0100, Jon Hunter wrote:
> The following error messages are observed on boot for Tegra234 ...
> 
>  ERR KERN tegra-qspi 3270000.spi: cannot use DMA: -19
>  ERR KERN tegra-qspi 3270000.spi: falling back to PIO
> 
> Tegra234 does not support DMA for the QSPI and so initialising the DMA
> is expected to fail. The above error messages are misleading for devices
> that don't support DMA and so fix this by skipping the DMA
> initialisation for devices that don't support DMA.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: tegra210-quad: Don't initialise DMA if not supported
      commit: ae4b3c1252f0fd0951d2f072a02ba46cac8d6c92

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/drivers/spi/spi-tegra210-quad.c b/drivers/spi/spi-tegra210-quad.c
index 904972606bd4..10f0c5a6e0dc 100644
--- a/drivers/spi/spi-tegra210-quad.c
+++ b/drivers/spi/spi-tegra210-quad.c
@@ -720,6 +720,9 @@  static int tegra_qspi_start_cpu_based_transfer(struct tegra_qspi *qspi, struct s
 
 static void tegra_qspi_deinit_dma(struct tegra_qspi *tqspi)
 {
+	if (!tqspi->soc_data->has_dma)
+		return;
+
 	if (tqspi->tx_dma_buf) {
 		dma_free_coherent(tqspi->dev, tqspi->dma_buf_size,
 				  tqspi->tx_dma_buf, tqspi->tx_dma_phys);
@@ -750,6 +753,9 @@  static int tegra_qspi_init_dma(struct tegra_qspi *tqspi)
 	u32 *dma_buf;
 	int err;
 
+	if (!tqspi->soc_data->has_dma)
+		return 0;
+
 	dma_chan = dma_request_chan(tqspi->dev, "rx");
 	if (IS_ERR(dma_chan)) {
 		err = PTR_ERR(dma_chan);