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

Commit 5a66088b authored by Roger Quadros's avatar Roger Quadros Committed by Brian Norris
Browse files

mtd: mtd_oobtest: Show the verification error location and data 



Add a function memcmpshow() that compares the 2 data buffers
and shows the address:offset and data bytes on comparison failure.
This function  does not break at a comparison failure but runs the
check for the whole data buffer.

Use memcmpshow() instead of memcmp() for all the verification paths.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 09691661

drivers/mtd/tests/oobtest.c

+29 −7
Original line number Diff line number Diff line
@@ -115,6 +115,26 @@ static int write_whole_device(void) 
	return 0;

}



/* Display the address, offset and data bytes at comparison failure */

static int memcmpshow(loff_t addr, const void *cs, const void *ct, size_t count)

{

	const unsigned char *su1, *su2;

	int res;

	int ret = 0;

	size_t i = 0;



	for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--, i++) {

		res = *su1 ^ *su2;

		if (res) {

			pr_info("error @addr[0x%lx:0x%x] 0x%x -> 0x%x diff 0x%x\n",

				(unsigned long)addr, i, *su1, *su2, res);

			ret = 1;

		}

	}



	return ret;

}



static int verify_eraseblock(int ebnum)

{

	int i;
@@ -139,7 +159,8 @@ static int verify_eraseblock(int ebnum) 
			errcnt += 1;

			return err ? err : -1;

		}

		if (memcmp(readbuf, writebuf + (use_len_max * i) + use_offset,

		if (memcmpshow(addr, readbuf,

			       writebuf + (use_len_max * i) + use_offset,

			       use_len)) {

			pr_err("error: verify failed at %#llx\n",

			       (long long)addr);
@@ -167,7 +188,7 @@ static int verify_eraseblock(int ebnum) 
				errcnt += 1;

				return err ? err : -1;

			}

			if (memcmp(readbuf + use_offset,

			if (memcmpshow(addr, readbuf + use_offset,

				       writebuf + (use_len_max * i) + use_offset,

				       use_len)) {

				pr_err("error: verify failed at %#llx\n",
@@ -233,7 +254,7 @@ static int verify_eraseblock_in_one_go(int ebnum) 
		errcnt += 1;

		return err ? err : -1;

	}

	if (memcmp(readbuf, writebuf, len)) {

	if (memcmpshow(addr, readbuf, writebuf, len)) {

		pr_err("error: verify failed at %#llx\n",

		       (long long)addr);

		errcnt += 1;
@@ -610,7 +631,8 @@ static int __init mtd_oobtest_init(void) 
		err = mtd_read_oob(mtd, addr, &ops);

		if (err)

			goto out;

		if (memcmp(readbuf, writebuf, mtd->ecclayout->oobavail * 2)) {

		if (memcmpshow(addr, readbuf, writebuf,

			       mtd->ecclayout->oobavail * 2)) {

			pr_err("error: verify failed at %#llx\n",

			       (long long)addr);

			errcnt += 1;