Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b5117d5 authored by Tanya Brokhman's avatar Tanya Brokhman
Browse files

Revert "mtd: ubi: Read threshold verification" 



This reverts commit ee81602c.

This patch is part of the "read-disturb implementation" set of patches.
It was decided to take different approach in addressing the read disturb,
thus the whole patch series is reverted in order to simplify the code and
reduce memory footprint.

Change-Id: I90656555a5e8b1ddb9fdc3d0eaa0acff8dbf77eb
Signed-off-by: default avatarTanya Brokhman <tlinder@codeaurora.org>
parent 9a12f57a

drivers/mtd/ubi/eba.c

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) International Business Machines Corp., 2006

 * Copyright (c) 2014, Linux Foundation. All rights reserved.

 * Linux Foundation chooses to take subject only to the GPLv2

 * license terms, and distributes only under these terms.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -469,10 +466,8 @@ retry: 
			goto out_unlock;

		}

	}

	if (ubi->lookuptbl[pnum]->rc >= ubi->rd_threshold)

		scrub = 1;



	if (scrub && !ubi_in_wl_tree(ubi->lookuptbl[pnum], &ubi->scrub))

	if (scrub)

		err = ubi_wl_scrub_peb(ubi, pnum);



	leb_read_unlock(ubi, vol_id, lnum);

drivers/mtd/ubi/wl.c

+9 −54
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static struct ubi_wl_entry *find_anchor_wl_entry(struct rb_root *root) 
	return victim;

}



static int anchor_pebs_avalible(struct rb_root *root, int rd_threshold)

static int anchor_pebs_avalible(struct rb_root *root)

{

	struct rb_node *p;

	struct ubi_wl_entry *e;
@@ -568,13 +568,6 @@ static void return_unused_pool_pebs(struct ubi_device *ubi, 


	for (i = pool->used; i < pool->size; i++) {

		e = ubi->lookuptbl[pool->pebs[i]];

		/* If given PEB pending to be scrubbed - remove it */

		if (ubi_in_wl_tree(e, &ubi->scrub)) {

			ubi_err(ubi->ubi_num,

				"PEB %d was pending scrubb", e->pnum);

			self_check_in_wl_tree(ubi, e, &ubi->scrub);

			rb_erase(&e->u.rb, &ubi->scrub);

		}

		wl_tree_add(e, &ubi->free);

		ubi->free_count++;

	}
@@ -1106,13 +1099,6 @@ static int schedule_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, 
	wl_wrk->lnum = lnum;

	wl_wrk->torture = torture;



	/* If given PEB pending to be scrubbed - remove it */

	if (ubi_in_wl_tree(e, &ubi->scrub)) {

		self_check_in_wl_tree(ubi, e, &ubi->scrub);

		rb_erase(&e->u.rb, &ubi->scrub);

		ubi_msg(ubi->ubi_num, "PEB %d was pending scrubb",

				e->pnum);

	}

	schedule_ubi_work(ubi, wl_wrk);

	return 0;

}
@@ -1142,14 +1128,6 @@ static int do_sync_erase(struct ubi_device *ubi, struct ubi_wl_entry *e, 
	wl_wrk->lnum = lnum;

	wl_wrk->torture = torture;



	/* If given PEB pending to be scrubbed - remove it */

	if (ubi_in_wl_tree(e, &ubi->scrub)) {

		self_check_in_wl_tree(ubi, e, &ubi->scrub);

		rb_erase(&e->u.rb, &ubi->scrub);

		ubi_msg(ubi->ubi_num, "PEB %d was pending scrubb",

				e->pnum);

	}



	return erase_worker(ubi, wl_wrk, 0);

}
@@ -1254,7 +1232,7 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
#ifdef CONFIG_MTD_UBI_FASTMAP

	/* Check whether we need to produce an anchor PEB */

	if (!anchor)

		anchor = !anchor_pebs_avalible(&ubi->free, ubi->rd_threshold);

		anchor = !anchor_pebs_avalible(&ubi->free);



	if (anchor) {

		e1 = find_anchor_wl_entry(&ubi->used);
@@ -1823,8 +1801,6 @@ retry: 
		} else if (ubi_in_wl_tree(e, &ubi->scrub)) {

			self_check_in_wl_tree(ubi, e, &ubi->scrub);

			rb_erase(&e->u.rb, &ubi->scrub);

			ubi_msg(ubi->ubi_num, "PEB %d was pending scrubb",

				e->pnum);

		} else if (ubi_in_wl_tree(e, &ubi->erroneous)) {

			self_check_in_wl_tree(ubi, e, &ubi->erroneous);

			rb_erase(&e->u.rb, &ubi->erroneous);
@@ -1868,6 +1844,8 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum) 
{

	struct ubi_wl_entry *e;



	ubi_msg(ubi->ubi_num, "schedule PEB %d for scrubbing", pnum);



retry:

	spin_lock(&ubi->wl_lock);

	e = ubi->lookuptbl[pnum];
@@ -2105,9 +2083,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
	struct ubi_ainf_volume *av;

	struct ubi_ainf_peb *aeb, *tmp;

	struct ubi_wl_entry *e;

	struct timeval tv;



	do_gettimeofday(&tv);

	ubi->used = ubi->erroneous = ubi->free = ubi->scrub = RB_ROOT;

	spin_lock_init(&ubi->wl_lock);

	mutex_init(&ubi->move_mutex);
@@ -2191,21 +2167,12 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
		e->last_erase_time = aeb->last_erase_time;

		ubi_assert(e->ec >= 0);

		ubi_assert(!ubi_is_fm_block(ubi, e->pnum));

		ubi->lookuptbl[e->pnum] = e;

		/* Check last erase timestamp (in days) */

		if (e->last_erase_time + ubi->dt_threshold <

			(tv.tv_sec / NUM_SEC_IN_DAY)) {

			if (schedule_erase(ubi, e, aeb->vol_id, aeb->lnum, 0)) {

				kmem_cache_free(ubi_wl_entry_slab, e);

				goto out_free;

			}

		} else if (!ai->failed_fm) {



		wl_tree_add(e, &ubi->free);

		ubi->free_count++;

		} else if (schedule_erase(ubi, e, aeb->vol_id, aeb->lnum, 0)) {

			kmem_cache_free(ubi_wl_entry_slab, e);

			goto out_free;

		}



		ubi->lookuptbl[e->pnum] = e;



		found_pebs++;

	}
@@ -2234,18 +2201,6 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) 
			e->last_erase_time = aeb->last_erase_time;

			ubi->lookuptbl[e->pnum] = e;



			/*

			 * Verify last erase timestamp

			 * (in days) and read counter

			 */

			if (e->last_erase_time + ubi->dt_threshold <

				(tv.tv_sec / NUM_SEC_IN_DAY) ||

				e->rc > ubi->rd_threshold) {

				ubi_msg(ubi->ubi_num,

					"scrub PEB %d rc = %d",

				       e->pnum, e->rc);

				aeb->scrub = 1;

			}

			if (!aeb->scrub) {

				dbg_wl("add PEB %d EC %d to the used tree",

				       e->pnum, e->ec);