summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratyush Yadav <p.yadav@ti.com>2020-12-23 00:14:20 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 09:39:42 +0100
commit3fbf7d82124fd7d39e3ca5ebb93909f65c96bbfd (patch)
tree74a540e7545b2b4a5b8d2cf1430f23e440657bc6
parent96826c805ae7190082af58d2c609cafe88e41f2d (diff)
downloadlinux-stable-3fbf7d82124fd7d39e3ca5ebb93909f65c96bbfd.tar.gz
linux-stable-3fbf7d82124fd7d39e3ca5ebb93909f65c96bbfd.tar.bz2
linux-stable-3fbf7d82124fd7d39e3ca5ebb93909f65c96bbfd.zip
spi: cadence-quadspi: Abort read if dummy cycles required are too many
[ Upstream commit ceeda328edeeeeac7579e9dbf0610785a3b83d39 ] The controller can only support up to 31 dummy cycles. If the command requires more it falls back to using 31. This command is likely to fail because the correct number of cycles are not waited upon. Rather than silently issuing an incorrect command, fail loudly so the caller can get a chance to find out the command can't be supported by the controller. Fixes: 140623410536 ("mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller") Signed-off-by: Pratyush Yadav <p.yadav@ti.com> Link: https://lore.kernel.org/r/20201222184425.7028-3-p.yadav@ti.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/mtd/spi-nor/cadence-quadspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 04cedd3a2bf6..a92f531ad23a 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -473,7 +473,7 @@ static int cqspi_read_setup(struct spi_nor *nor)
/* Setup dummy clock cycles */
dummy_clk = nor->read_dummy;
if (dummy_clk > CQSPI_DUMMY_CLKS_MAX)
- dummy_clk = CQSPI_DUMMY_CLKS_MAX;
+ return -EOPNOTSUPP;
if (dummy_clk / 8) {
reg |= (1 << CQSPI_REG_RD_INSTR_MODE_EN_LSB);