2023-02-22 09:22:22

by 电子

Subject: [PATCH] spi: cadence-quadspi: Fix cancel the indirect read mask

This is to cancel the indirect read transfer process,
so should be use CQSPI_REG_INDIRECTRD_CANCEL_MASK

Signed-off-by: Hongbin Ji <[email protected]>
---
drivers/spi/spi-cadence-quadspi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 676313e1bdad..967cb8ec0eec 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -766,7 +766,7 @@ static int cqspi_indirect_read_execute(struct cqspi_flash_pdata *f_pdata,
writel(0, reg_base + CQSPI_REG_IRQMASK);

/* Cancel the indirect read */
- writel(CQSPI_REG_INDIRECTWR_CANCEL_MASK,
+ writel(CQSPI_REG_INDIRECTRD_CANCEL_MASK,
reg_base + CQSPI_REG_INDIRECTRD);
return ret;
}
--
2.34.1

2023-02-23 08:22:56

by Dhruva Gole

Subject: Re: [PATCH] spi: cadence-quadspi: Fix cancel the indirect read mask

Hi Hongbin,

On 22/02/23 14:51, Hongbin Ji wrote:
> This is to cancel the indirect read transfer process,
> so should be use CQSPI_REG_INDIRECTRD_CANCEL_MASK

Good catch!
Both macros expand to BIT(1) so probably we did not face any issues so
far.

>
> Signed-off-by: Hongbin Ji <[email protected]>
> ---

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

> drivers/spi/spi-cadence-quadspi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
> index 676313e1bdad..967cb8ec0eec 100644
> --- a/drivers/spi/spi-cadence-quadspi.c
> +++ b/drivers/spi/spi-cadence-quadspi.c
> @@ -766,7 +766,7 @@ static int cqspi_indirect_read_execute(struct cqspi_flash_pdata *f_pdata,
> writel(0, reg_base + CQSPI_REG_IRQMASK);
>
> /* Cancel the indirect read */
> - writel(CQSPI_REG_INDIRECTWR_CANCEL_MASK,
> + writel(CQSPI_REG_INDIRECTRD_CANCEL_MASK,
> reg_base + CQSPI_REG_INDIRECTRD);
> return ret;
> }

--
Thanks and Regards,
Dhruva Gole

2023-02-23 13:07:05

by Mark Brown

Subject: Re: [PATCH] spi: cadence-quadspi: Fix cancel the indirect read mask

On Wed, 22 Feb 2023 17:21:28 +0800, Hongbin Ji wrote:
> This is to cancel the indirect read transfer process,
> so should be use CQSPI_REG_INDIRECTRD_CANCEL_MASK
>
>

Applied to

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

Thanks!

[1/1] spi: cadence-quadspi: Fix cancel the indirect read mask
commit: 152ac60677aa3760d0850de0db33d495f55e8aba

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