summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLiu Xiang <liu.xiang6@zte.com.cn>2018-08-28 22:32:57 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-13 11:08:15 -0800
commite40d8067fe8ef7c59184d508373e9cca22c911fe (patch)
tree4557a35d2857151982486c4e2785baceffc0448a /drivers
parent53772af08acd3e5143a5c1e6f7b8ddd3cabb350f (diff)
downloadlinux-rpi3-e40d8067fe8ef7c59184d508373e9cca22c911fe.tar.gz
linux-rpi3-e40d8067fe8ef7c59184d508373e9cca22c911fe.tar.bz2
linux-rpi3-e40d8067fe8ef7c59184d508373e9cca22c911fe.zip
mtd: spi-nor: fsl-quadspi: fix read error for flash size larger than 16MB
commit 41fe242979e463d6ad251077ded01b825a330b7e upstream. If the size of spi-nor flash is larger than 16MB, the read_opcode is set to SPINOR_OP_READ_1_1_4_4B, and fsl_qspi_get_seqid() will return -EINVAL when cmd is SPINOR_OP_READ_1_1_4_4B. This can cause read operation fail. Fixes: e46ecda764dc ("mtd: spi-nor: Add Freescale QuadSPI driver") Cc: <stable@vger.kernel.org> Signed-off-by: Liu Xiang <liu.xiang6@zte.com.cn> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/spi-nor/fsl-quadspi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c
index 7d9620c7ff6c..64304a3d675e 100644
--- a/drivers/mtd/spi-nor/fsl-quadspi.c
+++ b/drivers/mtd/spi-nor/fsl-quadspi.c
@@ -478,6 +478,7 @@ static int fsl_qspi_get_seqid(struct fsl_qspi *q, u8 cmd)
{
switch (cmd) {
case SPINOR_OP_READ_1_1_4:
+ case SPINOR_OP_READ_1_1_4_4B:
return SEQID_READ;
case SPINOR_OP_WREN:
return SEQID_WREN;