2023-01-02 16:32:41

by Vincent Whitchurch

[permalink] [raw]
Subject: [PATCH] spi: pl022: Only use DT-specified DMA channels

When a platform is booted with devicetree and does not provide a
platform data structure, the driver creates one internally. enable_dma
should not be set in this structure when creating it; the probe function
will set it later if DMA channels are specified via the devicetree.

Setting enable_dma = 1 when creating this internal platform data can
lead to pl022_dma_probe() finding bogus DMA channels (since there is no
channel filter specified) when no DMA channels are specified in the
devicetree.

Signed-off-by: Vincent Whitchurch <[email protected]>
---
drivers/spi/spi-pl022.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index e4484ace584e..a17ff839117f 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2091,7 +2091,6 @@ pl022_platform_data_dt_get(struct device *dev)
return NULL;

pd->bus_id = -1;
- pd->enable_dma = 1;
of_property_read_u32(np, "pl022,autosuspend-delay",
&pd->autosuspend_delay);
pd->rt = of_property_read_bool(np, "pl022,rt");
--
2.34.1


2023-01-03 09:28:05

by Dhruva Gole

[permalink] [raw]
Subject: Re: [PATCH] spi: pl022: Only use DT-specified DMA channels

Hey Vincent,

On 02/01/23 21:38, Vincent Whitchurch wrote:
> When a platform is booted with devicetree and does not provide a
> platform data structure, the driver creates one internally. enable_dma
> should not be set in this structure when creating it; the probe function
> will set it later if DMA channels are specified via the devicetree.

Yeah, I agree.

>
> Setting enable_dma = 1 when creating this internal platform data can
> lead to pl022_dma_probe() finding bogus DMA channels (since there is no
> channel filter specified) when no DMA channels are specified in the
> devicetree.
>
> Signed-off-by: Vincent Whitchurch <[email protected]>
> ---

Acked-by: Dhruva Gole <[email protected]>

> drivers/spi/spi-pl022.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
> index e4484ace584e..a17ff839117f 100644
> --- a/drivers/spi/spi-pl022.c
> +++ b/drivers/spi/spi-pl022.c
> @@ -2091,7 +2091,6 @@ pl022_platform_data_dt_get(struct device *dev)
> return NULL;
>
> pd->bus_id = -1;
> - pd->enable_dma = 1;
> of_property_read_u32(np, "pl022,autosuspend-delay",
> &pd->autosuspend_delay);
> pd->rt = of_property_read_bool(np, "pl022,rt");

--
Thanks and Regards,
Dhruva Gole

2023-01-03 15:25:47

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] spi: pl022: Only use DT-specified DMA channels

On Mon, 02 Jan 2023 17:08:51 +0100, Vincent Whitchurch wrote:
> When a platform is booted with devicetree and does not provide a
> platform data structure, the driver creates one internally. enable_dma
> should not be set in this structure when creating it; the probe function
> will set it later if DMA channels are specified via the devicetree.
>
> Setting enable_dma = 1 when creating this internal platform data can
> lead to pl022_dma_probe() finding bogus DMA channels (since there is no
> channel filter specified) when no DMA channels are specified in the
> devicetree.
>
> [...]

Applied to

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

Thanks!

[1/1] spi: pl022: Only use DT-specified DMA channels
commit: dfce16722b9cb842a6f23500ee80b3d07b47bdd4

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