298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-07-05 01:47:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

ar71xx: fix mtd check patch

Browse Source
This commit is contained in:
LEAN-ESX 2019-10-09 01:22:04 -07:00
parent a99a8179b4
commit a9e6d15c64
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch
View File

@ -1,26 +1,24 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1631,8 +1631,8 @@ static int __xipram do_write_oneword(str @@ -1637,7 +1637,7 @@ static int __xipram do_write_oneword(str
break;
} }
- if (chip_ready(map, adr)) if (chip_good(map, adr, datum))
- break; - break;
+ if (chip_good(map, adr, datum))
+ goto enable_xip; + goto enable_xip;
/* Latency issues. Drop the lock, wait a while and retry */ /* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1); UDELAY(map, chip, adr, 1);
@@ -1648,6 +1648,8 @@ static int __xipram do_write_oneword(str @@ -1654,6 +1654,8 @@ static int __xipram do_write_oneword(str
goto retry;
ret = -EIO; }
} }
+ +
+ enable_xip: + enable_xip:
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
op_done: op_done:
if (mode == FL_OTP_WRITE) if (mode == FL_OTP_WRITE)
@@ -2226,7 +2228,6 @@ static int cfi_amdstd_panic_write(struct @@ -2232,7 +2234,6 @@ static int cfi_amdstd_panic_write(struct
return 0; return 0;
} }
@ -28,7 +26,7 @@
/* /*
* Handle devices with one erase region, that only implement * Handle devices with one erase region, that only implement
* the chip erase command. * the chip erase command.
@@ -2294,7 +2295,7 @@ static int __xipram do_erase_chip(struct @@ -2300,7 +2301,7 @@ static int __xipram do_erase_chip(struct
} }
if (chip_good(map, adr, map_word_ff(map))) if (chip_good(map, adr, map_word_ff(map)))
@ -37,7 +35,7 @@
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n", printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -2318,6 +2319,7 @@ static int __xipram do_erase_chip(struct @@ -2324,6 +2325,7 @@ static int __xipram do_erase_chip(struct
} }
} }
@ -45,7 +43,7 @@
chip->state = FL_READY; chip->state = FL_READY;
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
DISABLE_VPP(map); DISABLE_VPP(map);
@@ -2391,7 +2393,7 @@ static int __xipram do_erase_oneblock(st @@ -2397,7 +2399,7 @@ static int __xipram do_erase_oneblock(st
if (chip_good(map, adr, map_word_ff(map))) { if (chip_good(map, adr, map_word_ff(map))) {
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
@ -54,7 +52,7 @@
} }
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -2417,6 +2419,7 @@ static int __xipram do_erase_oneblock(st @@ -2423,6 +2425,7 @@ static int __xipram do_erase_oneblock(st
} }
} }