| Message ID | 20200116093700.28308-1-michael@walle.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: spi-nor: Fix quad enable for Spansion like flashes | expand |
On Thursday, January 16, 2020 11:37:00 AM EET Michael Walle wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the > content is safe > > The commit 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable > methods") forgot to actually set the QE bit in some cases. Thus this > breaks quad mode accesses to flashes which support readback of the > status register-2. Fix it. > > Fixes: 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable methods") > Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Thanks, Michael! > --- > drivers/mtd/spi-nor/spi-nor.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index addb6319fcbb..ea0429448207 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -2140,6 +2140,8 @@ static int spi_nor_sr2_bit1_quad_enable(struct spi_nor > *nor) if (nor->bouncebuf[0] & SR2_QUAD_EN_BIT1) > return 0; > > + nor->bouncebuf[0] |= SR2_QUAD_EN_BIT1; > + > return spi_nor_write_16bit_cr_and_check(nor, nor->bouncebuf[0]); > } > > -- > 2.20.1
Miquel, Please queue this to mtd/fixes. Thanks, ta On Thursday, January 16, 2020 11:37:00 AM EET Michael Walle wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the > content is safe > > The commit 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable > methods") forgot to actually set the QE bit in some cases. Thus this > breaks quad mode accesses to flashes which support readback of the > status register-2. Fix it. > > Fixes: 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable methods") > Signed-off-by: Michael Walle <michael@walle.cc> > --- > drivers/mtd/spi-nor/spi-nor.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index addb6319fcbb..ea0429448207 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -2140,6 +2140,8 @@ static int spi_nor_sr2_bit1_quad_enable(struct spi_nor > *nor) if (nor->bouncebuf[0] & SR2_QUAD_EN_BIT1) > return 0; > > + nor->bouncebuf[0] |= SR2_QUAD_EN_BIT1; > + > return spi_nor_write_16bit_cr_and_check(nor, nor->bouncebuf[0]); > } > > -- > 2.20.1
On Thu, 2020-01-16 at 09:37:00 UTC, Michael Walle wrote: > The commit 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable > methods") forgot to actually set the QE bit in some cases. Thus this > breaks quad mode accesses to flashes which support readback of the > status register-2. Fix it. > > Fixes: 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable methods") > Signed-off-by: Michael Walle <michael@walle.cc> > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks. Miquel
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index addb6319fcbb..ea0429448207 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -2140,6 +2140,8 @@ static int spi_nor_sr2_bit1_quad_enable(struct spi_nor *nor) if (nor->bouncebuf[0] & SR2_QUAD_EN_BIT1) return 0; + nor->bouncebuf[0] |= SR2_QUAD_EN_BIT1; + return spi_nor_write_16bit_cr_and_check(nor, nor->bouncebuf[0]); }
The commit 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable methods") forgot to actually set the QE bit in some cases. Thus this breaks quad mode accesses to flashes which support readback of the status register-2. Fix it. Fixes: 7b678c69c0ca ("mtd: spi-nor: Merge spansion Quad Enable methods") Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/spi-nor/spi-nor.c | 2 ++ 1 file changed, 2 insertions(+)