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

Commit 4085bcc6 authored by Roman Tereshonkov's avatar Roman Tereshonkov Committed by David Woodhouse
Browse files

mtd: tests: add multiblock erase test to the mtd_speedtest 



New multiblock erase speed test is added to mtd_speedtest.
It consists of 2-, 4-, 8-, 16-, 32- and 64-blocks at once
multiblock erase tests.

Signed-off-by: default avatarRoman Tereshonkov <roman.tereshonkov@nokia.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent fc7fe769

drivers/mtd/tests/mtd_speedtest.c

+57 −2
Original line number Original line Diff line number Diff line
@@ -94,6 +94,33 @@ static int erase_eraseblock(int ebnum) 
	return 0;

	return 0;

}

}





static int multiblock_erase(int ebnum, int blocks)

{

	int err;

	struct erase_info ei;

	loff_t addr = ebnum * mtd->erasesize;



	memset(&ei, 0, sizeof(struct erase_info));

	ei.mtd  = mtd;

	ei.addr = addr;

	ei.len  = mtd->erasesize * blocks;



	err = mtd->erase(mtd, &ei);

	if (err) {

		printk(PRINT_PREF "error %d while erasing EB %d, blocks %d\n",

		       err, ebnum, blocks);

		return err;

	}



	if (ei.state == MTD_ERASE_FAILED) {

		printk(PRINT_PREF "some erase error occurred at EB %d,"

		       "blocks %d\n", ebnum, blocks);

		return -EIO;

	}



	return 0;

}



static int erase_whole_device(void)

static int erase_whole_device(void)

{

{

	int err;

	int err;
@@ -292,7 +319,10 @@ static long calc_speed(void) 
	ms = (finish.tv_sec - start.tv_sec) * 1000 +

	ms = (finish.tv_sec - start.tv_sec) * 1000 +

	     (finish.tv_usec - start.tv_usec) / 1000;

	     (finish.tv_usec - start.tv_usec) / 1000;

	k = goodebcnt * mtd->erasesize / 1024;

	k = goodebcnt * mtd->erasesize / 1024;

	if (ms)

		speed = (k * 1000) / ms;

		speed = (k * 1000) / ms;

	else

		speed = 0;

	return speed;

	return speed;

}

}
@@ -325,7 +355,7 @@ static int scan_for_bad_eraseblocks(void) 




static int __init mtd_speedtest_init(void)

static int __init mtd_speedtest_init(void)

{

{

	int err, i;

	int err, i, blocks, j, k;

	long speed;

	long speed;

	uint64_t tmp;

	uint64_t tmp;
@@ -495,6 +525,31 @@ static int __init mtd_speedtest_init(void) 
	speed = calc_speed();

	speed = calc_speed();

	printk(PRINT_PREF "erase speed is %ld KiB/s\n", speed);

	printk(PRINT_PREF "erase speed is %ld KiB/s\n", speed);





	/* Multi-block erase all eraseblocks */

	for (k = 1; k < 7; k++) {

		blocks = 1 << k;

		printk(PRINT_PREF "Testing %dx multi-block erase speed\n",

		       blocks);

		start_timing();

		for (i = 0; i < ebcnt; ) {

			for (j = 0; j < blocks && (i + j) < ebcnt; j++)

				if (bbt[i + j])

					break;

			if (j < 1) {

				i++;

				continue;

			}

			err = multiblock_erase(i, j);

			if (err)

				goto out;

			cond_resched();

			i += j;

		}

		stop_timing();

		speed = calc_speed();

		printk(PRINT_PREF "%dx multi-block erase speed is %ld KiB/s\n",

		       blocks, speed);

	}

	printk(PRINT_PREF "finished\n");

	printk(PRINT_PREF "finished\n");

out:

out:

	kfree(iobuf);

	kfree(iobuf);