From patchwork Fri Oct 15 15:18:06 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Paranoid chip test infrastructure, part 1
Date: Fri, 15 Oct 2010 15:18:06 -0000
From: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
X-Patchwork-Id: 2116
Message-Id: <4CB870AE.6010502@gmx.net>
To: flashrom <flashrom@flashrom.org>

Add a function which checks erase and write operations and makes sure
that neither touch anything outside the desired region.
Runtime is O(n^2).

A less paranoid version can have O(n) runtime, but I think it is
valuable to have the paranoid option.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coreboot.org>


Index: flashrom-test_chip_infrastructure/flash.h
===================================================================
--- flashrom-test_chip_infrastructure/flash.h	(Revision 1212)
+++ flashrom-test_chip_infrastructure/flash.h	(Arbeitskopie)
@@ -37,6 +37,8 @@
 
 /* Error codes */
 #define TIMEOUT_ERROR	-101
+#define VERIFY_ERROR	-201
+#define COMMAND_ERROR	-202
 
 typedef unsigned long chipaddr;
 
Index: flashrom-test_chip_infrastructure/flashrom.c
===================================================================
--- flashrom-test_chip_infrastructure/flashrom.c	(Revision 1212)
+++ flashrom-test_chip_infrastructure/flashrom.c	(Arbeitskopie)
@@ -1271,6 +1271,65 @@
 	return ret;
 }
 
+/* This function expects the previous flash contents in oldcontents, and the
+ * wanted flash contents in newcontents. Usually both are test patterns, and
+ * they should be distinct. The region from start to start+len-1 is expected
+ * to be already erased.
+ */
+int autotest_write_eraseregion_paranoid(struct flashchip *flash,
+					unsigned int start, unsigned int len,
+					uint8_t *oldcontents,
+					uint8_t *newcontents)
+{
+	/* Checking integrity of just erased range is not needed, the erase
+	 * function will do that itself. Do it anyway for nicer diagnostics.
+	 */
+	if (check_erased_range(flash, start, len)) {
+		msg_cerr("Error in just erased range 0x%x-0x%x\n",
+			 start, start + len - 1);
+		return VERIFY_ERROR;
+	}
+	/* Check integrity of previously written range. */
+	if (verify_range(flash, newcontents, 0, start, NULL)) {
+		msg_cerr("Error in previously written range 0x%x-0x%x\n",
+			 0, start - 1);
+		return VERIFY_ERROR;
+	}
+	/* Check integrity of not yet written range. */
+	if (verify_range(flash, oldcontents + start + len, start + len,
+			 flash->total_size * 1024 - start - len, NULL)) {
+		msg_cerr("Error in not yet written range 0x%x-0x%x\n",
+			 start + len, flash->total_size * 1024 - 1);
+		return VERIFY_ERROR;
+	}
+	/* Check if the write function fails. */
+	if (flash->write(flash, newcontents + start, start, len)) {
+		msg_cerr("Error during write in range 0x%x-0x%x\n",
+			 start, start + len - 1);
+		return COMMAND_ERROR;
+	}
+	/* Check integrity of just written range. */
+	if (verify_range(flash, newcontents + start, start, len, NULL)) {
+		msg_cerr("Error in just written range 0x%x-0x%x\n",
+			 start, start + len - 1);
+		return VERIFY_ERROR;
+	}
+	/* Recheck integrity of previously written range. */
+	if (verify_range(flash, newcontents, 0, start, NULL)) {
+		msg_cerr("Error in previously written range 0x%x-0x%x\n",
+			 0, start - 1);
+		return VERIFY_ERROR;
+	}
+	/* Recheck integrity of not yet written range. */
+	if (verify_range(flash, oldcontents + start + len, start + len,
+			 flash->total_size * 1024 - start - len, NULL)) {
+		msg_cerr("Error in not yet written range 0x%x-0x%x\n",
+			 start + len, flash->total_size * 1024 - 1);
+		return VERIFY_ERROR;
+	}
+	return 0;
+}
+
 static int walk_eraseregions(struct flashchip *flash, int erasefunction,
 			     int (*do_something) (struct flashchip *flash,
 						  unsigned int addr,