Skip to content

Commit 8fcb215

Browse files
jespondegregkh
authored andcommitted
mtd: spi-nor: fix spansion quad enable
commit 807c16253319ee6ccf8873ae64f070f7eb532cd5 upstream. With the S25FL127S nor flash part, each writing to the configuration register takes hundreds of ms. During that time, no more accesses to the flash should be done (even reads). This commit adds a wait loop after the register writing until the flash finishes its work. This issue could make rootfs mounting fail when the latter was done too much closely to this quad enable bit setting step. And in this case, a driver as UBIFS may try to recover the filesystem and may broke it completely. Signed-off-by: Joël Esponde <joel.esponde@honeywell.com> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7dfea16 commit 8fcb215

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/mtd/spi-nor/spi-nor.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,6 +1057,13 @@ static int spansion_quad_enable(struct spi_nor *nor)
10571057
return -EINVAL;
10581058
}
10591059

1060+
ret = spi_nor_wait_till_ready(nor);
1061+
if (ret) {
1062+
dev_err(nor->dev,
1063+
"timeout while writing configuration register\n");
1064+
return ret;
1065+
}
1066+
10601067
/* read back and check it */
10611068
ret = read_cr(nor);
10621069
if (!(ret > 0 && (ret & CR_QUAD_EN_SPAN))) {

0 commit comments

Comments
 (0)