mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
2d02a4f5bd
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 807c16253319ee6ccf8873ae64f070f7eb532cd5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jo=C3=ABl=20Esponde?= <joel.esponde@honeywell.com>
|
|
Date: Wed, 23 Nov 2016 12:47:40 +0100
|
|
Subject: [PATCH] mtd: spi-nor: fix spansion quad enable
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -1263,6 +1263,13 @@ static int spansion_quad_enable(struct s
|
|
return ret;
|
|
}
|
|
|
|
+ ret = spi_nor_wait_till_ready(nor);
|
|
+ if (ret) {
|
|
+ dev_err(nor->dev,
|
|
+ "timeout while writing configuration register\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
/* read back and check it */
|
|
ret = read_cr(nor);
|
|
if (!(ret > 0 && (ret & CR_QUAD_EN_SPAN))) {
|