diff options
author | Felix Fietkau <nbd@nbd.name> | 2020-10-24 21:14:16 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2021-02-16 20:06:51 +0100 |
commit | b10d6044599d8c1fa7fbb2374bcbf30118d39db1 (patch) | |
tree | 3fc84f92c14dfa7178487b71e1b8d63c2b688439 /target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch | |
parent | 299b8554183791b325e393c880d32360d7d72f73 (diff) | |
download | upstream-b10d6044599d8c1fa7fbb2374bcbf30118d39db1.tar.gz upstream-b10d6044599d8c1fa7fbb2374bcbf30118d39db1.tar.bz2 upstream-b10d6044599d8c1fa7fbb2374bcbf30118d39db1.zip |
kernel: add linux 5.10 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch')
-rw-r--r-- | target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch new file mode 100644 index 0000000000..81d32ca5a5 --- /dev/null +++ b/target/linux/generic/pending-5.10/494-mtd-ubi-add-EOF-marker-support.patch @@ -0,0 +1,60 @@ +From: Gabor Juhos <juhosg@openwrt.org> +Subject: mtd: add EOF marker support to the UBI layer + +Signed-off-by: Gabor Juhos <juhosg@openwrt.org> +--- + drivers/mtd/ubi/attach.c | 25 ++++++++++++++++++++++--- + drivers/mtd/ubi/ubi.h | 1 + + 2 files changed, 23 insertions(+), 3 deletions(-) + +--- a/drivers/mtd/ubi/attach.c ++++ b/drivers/mtd/ubi/attach.c +@@ -926,6 +926,13 @@ static bool vol_ignored(int vol_id) + #endif + } + ++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 +@@ -958,9 +965,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)) { ++ pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n", ++ 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 +@@ -782,6 +782,7 @@ struct ubi_attach_info { + int mean_ec; + uint64_t ec_sum; + int ec_count; ++ bool eof_found; + struct kmem_cache *aeb_slab_cache; + struct ubi_ec_hdr *ech; + struct ubi_vid_io_buf *vidb; |