diff options
| author | Vignesh R | 2018-06-30 12:54:21 +0200 |
|---|---|---|
| committer | Boris Brezillon | 2018-07-03 10:01:44 +0200 |
| commit | aa7eee8a143a7e8b530eb1e75fb86cae793d1e21 (patch) | |
| tree | b8e949ab839c668758897988d5d9d79be115d5f1 /drivers/mtd/spi-nor/cadence-quadspi.c | |
| parent | Linux 4.18-rc3 (diff) | |
| download | kernel-qcow2-linux-aa7eee8a143a7e8b530eb1e75fb86cae793d1e21.tar.gz kernel-qcow2-linux-aa7eee8a143a7e8b530eb1e75fb86cae793d1e21.tar.xz kernel-qcow2-linux-aa7eee8a143a7e8b530eb1e75fb86cae793d1e21.zip | |
mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts
Sometimes when writing large size files to flash in direct/memory mapped
mode, it is seen that flash write enable command times out with error:
[ 503.146293] cadence-qspi 47040000.ospi: Flash command execution timed out.
This is because, we need to make sure previous direct write operation
is complete by polling for IDLE bit in CONFIG_REG before starting the
next operation.
Fix this by polling for IDLE bit after memory mapped write.
Fixes: a27f2eaf2b27 ("mtd: spi-nor: cadence-quadspi: Add support for direct access mode")
Cc: stable@vger.kernel.org
Signed-off-by: Vignesh R <vigneshr@ti.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Diffstat (limited to 'drivers/mtd/spi-nor/cadence-quadspi.c')
| -rw-r--r-- | drivers/mtd/spi-nor/cadence-quadspi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index c3f7aaa5d18f..d7e10b36a0b9 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c @@ -926,10 +926,12 @@ static ssize_t cqspi_write(struct spi_nor *nor, loff_t to, if (ret) return ret; - if (f_pdata->use_direct_mode) + if (f_pdata->use_direct_mode) { memcpy_toio(cqspi->ahb_base + to, buf, len); - else + ret = cqspi_wait_idle(cqspi); + } else { ret = cqspi_indirect_write_execute(nor, to, buf, len); + } if (ret) return ret; |