Skip to content

Commit 29e0b47

Browse files
prati0100broonie
authored andcommitted
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: 1406234 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller") CC: stable@vger.kernel.org Reviewed-by: Pratyush Yadav <pratyush@kernel.org> Signed-off-by: Pratyush Yadav <pratyush@kernel.org> Signed-off-by: Santhosh Kumar K <s-k6@ti.com> Message-ID: <20250905185958.3575037-2-s-k6@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 76eeb9b commit 29e0b47

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/spi/spi-cadence-quadspi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ static int cqspi_indirect_read_execute(struct cqspi_flash_pdata *f_pdata,
764764
reinit_completion(&cqspi->transfer_complete);
765765
writel(CQSPI_REG_INDIRECTRD_START_MASK,
766766
reg_base + CQSPI_REG_INDIRECTRD);
767+
readl(reg_base + CQSPI_REG_INDIRECTRD); /* Flush posted write. */
767768

768769
while (remaining > 0) {
769770
if (use_irq &&
@@ -1090,6 +1091,8 @@ static int cqspi_indirect_write_execute(struct cqspi_flash_pdata *f_pdata,
10901091
reinit_completion(&cqspi->transfer_complete);
10911092
writel(CQSPI_REG_INDIRECTWR_START_MASK,
10921093
reg_base + CQSPI_REG_INDIRECTWR);
1094+
readl(reg_base + CQSPI_REG_INDIRECTWR); /* Flush posted write. */
1095+
10931096
/*
10941097
* As per 66AK2G02 TRM SPRUHY8F section 11.15.5.3 Indirect Access
10951098
* Controller programming sequence, couple of cycles of

0 commit comments

Comments
 (0)