Skip to contentSkip to conversation

spi: cadence-quadspi: Fix cancel the indirect read mask

PATCH In review Hongbin Ji 3 participants 3 messages Feb 22, 2023 – Feb 23, 2023 SPI

lore
Share & tools
lore

Hongbin Ji

author
#0 lore raw

PATCH 1/1 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

---
 drivers/spi/spi-cadence-quadspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-cadence-quadspi.c +1 -1
index 676313e1bdad..967cb8ec0eec 100644
@@ -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;
 }
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw

Hi Hongbin,

Quoted 2 lines · Hongbin Ji

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.

Quoted 3 lines

---

Quoted 16 lines
  drivers/spi/spi-cadence-quadspi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-cadence-quadspi.c +1 -1
index 676313e1bdad..967cb8ec0eec 100644
@@ -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;
  }
Signature · 2 lines
Thanks and Regards,
Dhruva Gole
maintainer
#2 lore raw
In reply to Hongbin Ji
Quoted 4 lines · Hongbin Ji

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