Author: nbd Date: 2015-03-16 06:16:14 +0100 (Mon, 16 Mar 2015) New Revision: 44801
Added: trunk/target/linux/generic/patches-3.19/494-mtd-ubi-add-EOF-marker-support.patch trunk/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch Log: kernel: port missing ubi EOF marker support patch to 3.19 and 4.0 Signed-off-by: Felix Fietkau <[email protected]> Copied: trunk/target/linux/generic/patches-3.19/494-mtd-ubi-add-EOF-marker-support.patch (from rev 44800, trunk/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch) =================================================================== --- trunk/target/linux/generic/patches-3.19/494-mtd-ubi-add-EOF-marker-support.patch (rev 0) +++ trunk/target/linux/generic/patches-3.19/494-mtd-ubi-add-EOF-marker-support.patch 2015-03-16 05:16:14 UTC (rev 44801) @@ -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 +@@ -702,6 +702,7 @@ struct ubi_attach_info { + int mean_ec; + uint64_t ec_sum; + int ec_count; ++ bool eof_found; + struct kmem_cache *aeb_slab_cache; + }; + Copied: trunk/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch (from rev 44800, trunk/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch) =================================================================== --- trunk/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch (rev 0) +++ trunk/target/linux/generic/patches-4.0/494-mtd-ubi-add-EOF-marker-support.patch 2015-03-16 05:16:14 UTC (rev 44801) @@ -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; + }; + _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
