1 files changed, 19 insertions, 3 deletions

diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index b847745394b4..e7161adc419d 100644
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -75,9 +75,10 @@ static int add_to_list(struct ubi_scan_info *si, int pnum, int ec,
                 dbg_bld("add to free: PEB %d, EC %d", pnum, ec);
         else if (list == &si->erase)
                 dbg_bld("add to erase: PEB %d, EC %d", pnum, ec);
-        else if (list == &si->corr)
+        else if (list == &si->corr) {
                 dbg_bld("add to corrupted: PEB %d, EC %d", pnum, ec);
-        else if (list == &si->alien)
+                si->corr_count += 1;
+        } else if (list == &si->alien)
                 dbg_bld("add to alien: PEB %d, EC %d", pnum, ec);
         else
                 BUG();
@@ -864,7 +865,9 @@ static int process_eb(struct ubi_device *ubi, struct ubi_scan_info *si,
                 }
         }
 
-        /* Both UBI headers seem to be fine */
+        if (ec_corr)
+                ubi_warn("valid VID header but corrupted EC header at PEB %d",
+                         pnum);
         err = ubi_scan_add_used(ubi, si, pnum, ec, vidh, bitflips);
         if (err)
                 return err;
@@ -936,6 +939,19 @@ struct ubi_scan_info *ubi_scan(struct ubi_device *ubi)
                 ubi_msg("empty MTD device detected");
 
         /*
+         * Few corrupted PEBs are not a problem and may be just a result of
+         * unclean reboots. However, many of them may indicate some problems
+         * with the flash HW or driver. Print a warning in this case.
+         */
+        if (si->corr_count >= 8 || si->corr_count >= ubi->peb_count / 4) {
+                ubi_warn("%d PEBs are corrupted", si->corr_count);
+                printk(KERN_WARNING "corrupted PEBs are:");
+                list_for_each_entry(seb, &si->corr, u.list)
+                        printk(KERN_CONT " %d", seb->pnum);
+                printk(KERN_CONT "\n");
+        }
+
+        /*
          * In case of unknown erase counter we use the mean erase counter
          * value.
          */