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

Commit 8c1e6ee1 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rework scrubbing messages 



If bit-flips happen often, UBI prints to many messages. Lessen
the amount by only printing the messages when the PEB has been
scrubbed. Also, print torturing messages.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent f40ac9cd

drivers/mtd/ubi/io.c

+7 −1
Original line number Diff line number Diff line
@@ -156,8 +156,12 @@ int ubi_io_read(const struct ubi_device *ubi, void *buf, int pnum, int offset, 
			/*

			 * -EUCLEAN is reported if there was a bit-flip which

			 * was corrected, so this is harmless.

			 *

			 * We do not report about it here unless debugging is

			 * enabled. A corresponding message will be printed

			 * later, when it is has been scrubbed.

			 */

			ubi_msg("fixable bit-flip detected at PEB %d", pnum);

			dbg_msg("fixable bit-flip detected at PEB %d", pnum);

			ubi_assert(len == read);

			return UBI_IO_BITFLIPS;

		}
@@ -391,6 +395,7 @@ static int torture_peb(struct ubi_device *ubi, int pnum) 
{

	int err, i, patt_count;



	ubi_msg("run torture test for PEB %d", pnum);

	patt_count = ARRAY_SIZE(patterns);

	ubi_assert(patt_count > 0);
@@ -434,6 +439,7 @@ static int torture_peb(struct ubi_device *ubi, int pnum) 
	}



	err = patt_count;

	ubi_msg("PEB %d passed torture test, do not mark it a bad", pnum);



out:

	mutex_unlock(&ubi->buf_mutex);

drivers/mtd/ubi/wl.c

+5 −1
Original line number Diff line number Diff line
@@ -873,6 +873,10 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, 
	}



	ubi_free_vid_hdr(ubi, vid_hdr);

	if (scrubbing && !protect)

		ubi_msg("scrubbed PEB %d, data moved to PEB %d",

			e1->pnum, e2->pnum);



	spin_lock(&ubi->wl_lock);

	if (protect)

		prot_tree_add(ubi, e1, pe, protect);
@@ -1231,7 +1235,7 @@ int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum) 
{

	struct ubi_wl_entry *e;



	ubi_msg("schedule PEB %d for scrubbing", pnum);

	dbg_msg("schedule PEB %d for scrubbing", pnum);



retry:

	spin_lock(&ubi->wl_lock);