2022-06-02 13:14:43

by Patrice CHOTARD

[permalink] [raw]
Subject: [PATCH 1/1] spi: spi-mem: Fix spi_mem_poll_status()

From: Patrice Chotard <[email protected]>

In spi_mem_exec_op(), in case cs_gpiod descriptor is set, exec_op()
callback can't be used.
The same must be applied in spi_mem_poll_status(), poll_status()
callback can't be used, we must use the legacy path using
read_poll_timeout().

Tested on STM32mp257c-ev1 specific evaluation board on which a
spi-nand was mounted instead of a spi-nor.

Signed-off-by: Patrice Chotard <[email protected]>
Tested-by: Patrice Chotard <[email protected]>
---
drivers/spi/spi-mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index e8de4f5017cd..0c79193d9697 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -808,7 +808,7 @@ int spi_mem_poll_status(struct spi_mem *mem,
op->data.dir != SPI_MEM_DATA_IN)
return -EINVAL;

- if (ctlr->mem_ops && ctlr->mem_ops->poll_status) {
+ if (ctlr->mem_ops && ctlr->mem_ops->poll_status && !mem->spi->cs_gpiod) {
ret = spi_mem_access_start(mem);
if (ret)
return ret;
--
2.25.1



2022-06-06 16:31:21

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 1/1] spi: spi-mem: Fix spi_mem_poll_status()

On Thu, 2 Jun 2022 11:10:22 +0200, [email protected] wrote:
> From: Patrice Chotard <[email protected]>
>
> In spi_mem_exec_op(), in case cs_gpiod descriptor is set, exec_op()
> callback can't be used.
> The same must be applied in spi_mem_poll_status(), poll_status()
> callback can't be used, we must use the legacy path using
> read_poll_timeout().
>
> [...]

Applied to

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

Thanks!

[1/1] spi: spi-mem: Fix spi_mem_poll_status()
commit: 2283679f4c468df367830b7eb8f22d48a6940e19

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