forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ar71xx: update kernel patch to upstream
- Loading branch information
1 parent
abb35b7
commit 8f16df4
Showing
11 changed files
with
82 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
target/linux/ar71xx/patches-4.14/403-mtd_fix_cfi_cmdset_0002_status_check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| --- a/drivers/mtd/chips/cfi_cmdset_0002.c | ||
| +++ b/drivers/mtd/chips/cfi_cmdset_0002.c | ||
| @@ -1635,8 +1635,8 @@ static int __xipram do_write_oneword(str | ||
| break; | ||
| } | ||
|
|
||
| - if (chip_ready(map, adr)) | ||
| - break; | ||
| + if (chip_good(map, adr, datum)) | ||
| + goto enable_xip; | ||
|
|
||
| /* Latency issues. Drop the lock, wait a while and retry */ | ||
| UDELAY(map, chip, adr, 1); | ||
| @@ -1652,6 +1652,8 @@ static int __xipram do_write_oneword(str | ||
|
|
||
| ret = -EIO; | ||
| } | ||
| + | ||
| + enable_xip: | ||
| xip_enable(map, chip, adr); | ||
| op_done: | ||
| if (mode == FL_OTP_WRITE) | ||
| @@ -2230,7 +2232,6 @@ static int cfi_amdstd_panic_write(struct | ||
| return 0; | ||
| } | ||
|
|
||
| - | ||
| /* | ||
| * Handle devices with one erase region, that only implement | ||
| * the chip erase command. | ||
| @@ -2298,7 +2299,7 @@ static int __xipram do_erase_chip(struct | ||
| } | ||
|
|
||
| if (chip_good(map, adr, map_word_ff(map))) | ||
| - break; | ||
| + goto op_done; | ||
|
|
||
| if (time_after(jiffies, timeo)) { | ||
| printk(KERN_WARNING "MTD %s(): software timeout\n", | ||
| @@ -2322,6 +2323,7 @@ static int __xipram do_erase_chip(struct | ||
| } | ||
| } | ||
|
|
||
| + op_done: | ||
| chip->state = FL_READY; | ||
| xip_enable(map, chip, adr); | ||
| DISABLE_VPP(map); | ||
| @@ -2395,7 +2397,7 @@ static int __xipram do_erase_oneblock(st | ||
|
|
||
| if (chip_good(map, adr, map_word_ff(map))) { | ||
| xip_enable(map, chip, adr); | ||
| - break; | ||
| + goto op_done; | ||
| } | ||
|
|
||
| if (time_after(jiffies, timeo)) { | ||
| @@ -2421,6 +2423,7 @@ static int __xipram do_erase_oneblock(st | ||
| } | ||
| } | ||
|
|
||
| + op_done: | ||
| chip->state = FL_READY; | ||
| DISABLE_VPP(map); | ||
| put_chip(map, chip, adr); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.