Unverified Commit 29e0b471 authored by Pratyush Yadav's avatar Pratyush Yadav Committed by Mark Brown
Browse files

spi: cadence-quadspi: Flush posted register writes before INDAC access 



cqspi_indirect_read_execute() and cqspi_indirect_write_execute() first
set the enable bit on APB region and then start reading/writing to the
AHB region. On TI K3 SoCs these regions lie on different endpoints. This
means that the order of the two operations is not guaranteed, and they
might be reordered at the interconnect level.

It is possible for the AHB write to be executed before the APB write to
enable the indirect controller, causing the transaction to be invalid
and the write erroring out. Read back the APB region write before
accessing the AHB region to make sure the write got flushed and the race
condition is eliminated.

Fixes: 14062341 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller")
CC: stable@vger.kernel.org
Reviewed-by: default avatarPratyush Yadav <pratyush@kernel.org>
Signed-off-by: default avatarPratyush Yadav <pratyush@kernel.org>
Signed-off-by: default avatarSanthosh Kumar K <s-k6@ti.com>
Message-ID: <20250905185958.3575037-2-s-k6@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 76eeb9b8

drivers/spi/spi-cadence-quadspi.c

+3 −0
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ static int cqspi_indirect_read_execute(struct cqspi_flash_pdata *f_pdata, 
	reinit_completion(&cqspi->transfer_complete);

	writel(CQSPI_REG_INDIRECTRD_START_MASK,

	       reg_base + CQSPI_REG_INDIRECTRD);

	readl(reg_base + CQSPI_REG_INDIRECTRD); /* Flush posted write. */



	while (remaining > 0) {

		if (use_irq &&
@@ -1090,6 +1091,8 @@ static int cqspi_indirect_write_execute(struct cqspi_flash_pdata *f_pdata, 
	reinit_completion(&cqspi->transfer_complete);

	writel(CQSPI_REG_INDIRECTWR_START_MASK,

	       reg_base + CQSPI_REG_INDIRECTWR);

	readl(reg_base + CQSPI_REG_INDIRECTWR); /* Flush posted write. */



	/*

	 * As per 66AK2G02 TRM SPRUHY8F section 11.15.5.3 Indirect Access

	 * Controller programming sequence, couple of cycles of