aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-16 05:16:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-16 05:16:14 +0000
commitc75c90edf6eca8838f0d03caef7b86ef5d0eb528 (patch)
tree42fdbdf92b06acaf04d3e440dbdd55ae71bff5d2 /target/linux/generic/patches-4.0
parentadb6d8f93f221ce21dc333f98252dd08b5ea34f1 (diff)
downloadupstream-c75c90edf6eca8838f0d03caef7b86ef5d0eb528.tar.gz
upstream-c75c90edf6eca8838f0d03caef7b86ef5d0eb528.tar.bz2
upstream-c75c90edf6eca8838f0d03caef7b86ef5d0eb528.zip
kernel: port missing ubi EOF marker support patch to 3.19 and 4.0
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 44801
Diffstat (limited to 'target/linux/generic/patches-4.0')
-rw-r--r--target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch
new file mode 100644
index 0000000000..3d2724324b
--- /dev/null
+++ b/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch
@@ -0,0 +1,51 @@
+--- a/drivers/mtd/ubi/attach.c
++++ b/drivers/mtd/ubi/attach.c
+@@ -803,6 +803,13 @@ out_unlock:
+ return err;
+ }
+
++static bool ec_hdr_has_eof(struct ubi_ec_hdr *ech)
++{
++ return ech->padding1[0] == 'E' &&
++ ech->padding1[1] == 'O' &&
++ ech->padding1[2] == 'F';
++}
++
+ /**
+ * scan_peb - scan and process UBI headers of a PEB.
+ * @ubi: UBI device description object
+@@ -833,9 +840,21 @@ static int scan_peb(struct ubi_device *u
+ return 0;
+ }
+
+- err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
+- if (err < 0)
+- return err;
++ if (!ai->eof_found) {
++ err = ubi_io_read_ec_hdr(ubi, pnum, ech, 0);
++ if (err < 0)
++ return err;
++
++ if (ec_hdr_has_eof(ech)) {
++ ubi_msg("EOF marker found, PEBs from %d will be erased",
++ pnum);
++ ai->eof_found = true;
++ }
++ }
++
++ if (ai->eof_found)
++ err = UBI_IO_FF_BITFLIPS;
++
+ switch (err) {
+ case 0:
+ break;
+--- a/drivers/mtd/ubi/ubi.h
++++ b/drivers/mtd/ubi/ubi.h
+@@ -706,6 +706,7 @@ struct ubi_attach_info {
+ int mean_ec;
+ uint64_t ec_sum;
+ int ec_count;
++ bool eof_found;
+ struct kmem_cache *aeb_slab_cache;
+ };
+