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

Commit f5e2bae0 authored by Morten Thunberg Svendsen's avatar Morten Thunberg Svendsen Committed by David Woodhouse
Browse files

mtd: tests: fix read, speed and stress tests on NOR flash 



Before using block_isbad() check if mtd->block_isbad() is defined.
Calculating pgcnt must be done using pgsize defined to 512 on
NOR and mtd->writesize for NAND, not using  mtd->writesize directly.

Signed-off-by: default avatarMorten Thunberg Svendsen <mts.doredevelopment@gmail.com>
Acked-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent f6a8c609

drivers/mtd/tests/mtd_readtest.c

+5 −1
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ static int scan_for_bad_eraseblocks(void) 
	}

	memset(bbt, 0 , ebcnt);



	/* NOR flash does not implement block_isbad */

	if (mtd->block_isbad == NULL)

		return 0;



	printk(PRINT_PREF "scanning for bad eraseblocks\n");

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

		bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -184,7 +188,7 @@ static int __init mtd_readtest_init(void) 
	tmp = mtd->size;

	do_div(tmp, mtd->erasesize);

	ebcnt = tmp;

	pgcnt = mtd->erasesize / mtd->writesize;

	pgcnt = mtd->erasesize / pgsize;



	printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "

	       "page size %u, count of eraseblocks %u, pages per "

drivers/mtd/tests/mtd_speedtest.c

+6 −1
Original line number Diff line number Diff line
@@ -301,6 +301,10 @@ static int scan_for_bad_eraseblocks(void) 
	}

	memset(bbt, 0 , ebcnt);



	/* NOR flash does not implement block_isbad */

	if (mtd->block_isbad == NULL)

		goto out;



	printk(PRINT_PREF "scanning for bad eraseblocks\n");

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

		bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -309,6 +313,7 @@ static int scan_for_bad_eraseblocks(void) 
		cond_resched();

	}

	printk(PRINT_PREF "scanned %d eraseblocks, %d are bad\n", i, bad);

out:

	goodebcnt = ebcnt - bad;

	return 0;

}
@@ -340,7 +345,7 @@ static int __init mtd_speedtest_init(void) 
	tmp = mtd->size;

	do_div(tmp, mtd->erasesize);

	ebcnt = tmp;

	pgcnt = mtd->erasesize / mtd->writesize;

	pgcnt = mtd->erasesize / pgsize;



	printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "

	       "page size %u, count of eraseblocks %u, pages per "

drivers/mtd/tests/mtd_stresstest.c

+5 −1
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ static int scan_for_bad_eraseblocks(void) 
	}

	memset(bbt, 0 , ebcnt);



	/* NOR flash does not implement block_isbad */

	if (mtd->block_isbad == NULL)

		return 0;



	printk(PRINT_PREF "scanning for bad eraseblocks\n");

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

		bbt[i] = is_block_bad(i) ? 1 : 0;
@@ -265,7 +269,7 @@ static int __init mtd_stresstest_init(void) 
	tmp = mtd->size;

	do_div(tmp, mtd->erasesize);

	ebcnt = tmp;

	pgcnt = mtd->erasesize / mtd->writesize;

	pgcnt = mtd->erasesize / pgsize;



	printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, "

	       "page size %u, count of eraseblocks %u, pages per "