Skip to content

Commit 1ad5576

Browse files
prati0100broonie
authored andcommitted
spi: cadence-quadspi: Flush posted register writes before DAC access
cqspi_read_setup() and cqspi_write_setup() program the address width as the last step in the setup. This is likely to be immediately followed by a DAC region read/write. On TI K3 SoCs the DAC region is on a different endpoint from the register region. This means that the order of the two operations is not guaranteed, and they might be reordered at the interconnect level. It is possible that the DAC read/write goes through before the address width update goes through. In this situation if the previous command used a different address width the OSPI command is sent with the wrong number of address bytes, resulting in an invalid command and undefined behavior. Read back the size register to make sure the write gets flushed before accessing the DAC region. 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-3-s-k6@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 29e0b47 commit 1ad5576

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/spi/spi-cadence-quadspi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@ static int cqspi_read_setup(struct cqspi_flash_pdata *f_pdata,
719719
reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;
720720
reg |= (op->addr.nbytes - 1);
721721
writel(reg, reg_base + CQSPI_REG_SIZE);
722+
readl(reg_base + CQSPI_REG_SIZE); /* Flush posted write. */
722723
return 0;
723724
}
724725

@@ -1063,6 +1064,7 @@ static int cqspi_write_setup(struct cqspi_flash_pdata *f_pdata,
10631064
reg &= ~CQSPI_REG_SIZE_ADDRESS_MASK;
10641065
reg |= (op->addr.nbytes - 1);
10651066
writel(reg, reg_base + CQSPI_REG_SIZE);
1067+
readl(reg_base + CQSPI_REG_SIZE); /* Flush posted write. */
10661068
return 0;
10671069
}
10681070

0 commit comments

Comments
 (0)