Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 31 insertions, 23 deletions

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 97a435672eaf..ff2c4956eeff 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -161,7 +161,7 @@ struct ubi_work {
         int torture;
 };
 
-#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID
+#ifdef CONFIG_MTD_UBI_DEBUG
 static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec);
 static int paranoid_check_in_wl_tree(struct ubi_wl_entry *e,
                                      struct rb_root *root);
@@ -613,7 +613,7 @@ static void schedule_ubi_work(struct ubi_device *ubi, struct ubi_work *wrk)
         list_add_tail(&wrk->list, &ubi->works);
         ubi_assert(ubi->works_count >= 0);
         ubi->works_count += 1;
-        if (ubi->thread_enabled)
+        if (ubi->thread_enabled && !ubi_dbg_is_bgt_disabled())
                 wake_up_process(ubi->bgt_thread);
         spin_unlock(&ubi->wl_lock);
 }
@@ -745,7 +745,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
 
         err = ubi_io_read_vid_hdr(ubi, e1->pnum, vid_hdr, 0);
         if (err && err != UBI_IO_BITFLIPS) {
-                if (err == UBI_IO_PEB_FREE) {
+                if (err == UBI_IO_FF) {
                         /*
                          * We are trying to move PEB without a VID header. UBI
                          * always write VID headers shortly after the PEB was
@@ -759,6 +759,16 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
                         dbg_wl("PEB %d has no VID header", e1->pnum);
                         protect = 1;
                         goto out_not_moved;
+                } else if (err == UBI_IO_FF_BITFLIPS) {
+                        /*
+                         * The same situation as %UBI_IO_FF, but bit-flips were
+                         * detected. It is better to schedule this PEB for
+                         * scrubbing.
+                         */
+                        dbg_wl("PEB %d has no VID header but has bit-flips",
+                               e1->pnum);
+                        scrubbing = 1;
+                        goto out_not_moved;
                 }
 
                 ubi_err("error %d while reading VID header from PEB %d",
@@ -1354,7 +1364,7 @@ int ubi_thread(void *u)
 
                 spin_lock(&ubi->wl_lock);
                 if (list_empty(&ubi->works) || ubi->ro_mode ||
-                               !ubi->thread_enabled) {
+                    !ubi->thread_enabled || ubi_dbg_is_bgt_disabled()) {
                         set_current_state(TASK_INTERRUPTIBLE);
                         spin_unlock(&ubi->wl_lock);
                         schedule();
@@ -1468,22 +1478,6 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
                 ubi->lookuptbl[e->pnum] = e;
         }
 
-        list_for_each_entry(seb, &si->corr, u.list) {
-                cond_resched();
-
-                e = kmem_cache_alloc(ubi_wl_entry_slab, GFP_KERNEL);
-                if (!e)
-                        goto out_free;
-
-                e->pnum = seb->pnum;
-                e->ec = seb->ec;
-                ubi->lookuptbl[e->pnum] = e;
-                if (schedule_erase(ubi, e, 0)) {
-                        kmem_cache_free(ubi_wl_entry_slab, e);
-                        goto out_free;
-                }
-        }
-
         ubi_rb_for_each_entry(rb1, sv, &si->volumes, rb) {
                 ubi_rb_for_each_entry(rb2, seb, &sv->root, u.rb) {
                         cond_resched();
@@ -1510,6 +1504,9 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
         if (ubi->avail_pebs < WL_RESERVED_PEBS) {
                 ubi_err("no enough physical eraseblocks (%d, need %d)",
                         ubi->avail_pebs, WL_RESERVED_PEBS);
+                if (ubi->corr_peb_count)
+                        ubi_err("%d PEBs are corrupted and not used",
+                                ubi->corr_peb_count);
                 goto out_free;
         }
         ubi->avail_pebs -= WL_RESERVED_PEBS;
@@ -1564,7 +1561,7 @@ void ubi_wl_close(struct ubi_device *ubi)
         kfree(ubi->lookuptbl);
 }
 
-#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID
+#ifdef CONFIG_MTD_UBI_DEBUG
 
 /**
  * paranoid_check_ec - make sure that the erase counter of a PEB is correct.
@@ -1573,7 +1570,8 @@ void ubi_wl_close(struct ubi_device *ubi)
  * @ec: the erase counter to check
  *
  * This function returns zero if the erase counter of physical eraseblock @pnum
- * is equivalent to @ec, and a negative error code if not or if an error occurred.
+ * is equivalent to @ec, and a negative error code if not or if an error
+ * occurred.
  */
 static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec)
 {
@@ -1581,6 +1579,9 @@ static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec)
         long long read_ec;
         struct ubi_ec_hdr *ec_hdr;
 
+        if (!(ubi_chk_flags & UBI_CHK_GEN))
+                return 0;
+
         ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_NOFS);
         if (!ec_hdr)
                 return -ENOMEM;
@@ -1617,6 +1618,9 @@ out_free:
 static int paranoid_check_in_wl_tree(struct ubi_wl_entry *e,
                                      struct rb_root *root)
 {
+        if (!(ubi_chk_flags & UBI_CHK_GEN))
+                return 0;
+
         if (in_wl_tree(e, root))
                 return 0;
 
@@ -1639,6 +1643,9 @@ static int paranoid_check_in_pq(struct ubi_device *ubi, struct ubi_wl_entry *e)
         struct ubi_wl_entry *p;
         int i;
 
+        if (!(ubi_chk_flags & UBI_CHK_GEN))
+                return 0;
+
         for (i = 0; i < UBI_PROT_QUEUE_LEN; ++i)
                 list_for_each_entry(p, &ubi->pq[i], u.list)
                         if (p == e)
@@ -1649,4 +1656,5 @@ static int paranoid_check_in_pq(struct ubi_device *ubi, struct ubi_wl_entry *e)
         ubi_dbg_dump_stack();
         return -EINVAL;
 }
-#endif /* CONFIG_MTD_UBI_DEBUG_PARANOID */
+
+#endif /* CONFIG_MTD_UBI_DEBUG */