Add new command line flag "-C" to compute CRC

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

Author: borneoa

main.c

@@ -59,6 +59,7 @@ int		wu		= 0;
 int		rp		= 0;
 int		ur		= 0;
 int		eraseOnly	= 0;
+int		crc		= 0;
 int		npages		= 0;
 int             spage           = 0;
 int             no_erase        = 0;
@@ -424,6 +425,19 @@ int main(int argc, char* argv[]) {
 		fprintf(diag,	"Done.\n");
 		ret = 0;
 		goto close;
+	} else if (crc) {
+		uint32_t crc_val = 0;
+
+		fprintf(diag, "CRC computation\n");
+
+		if (!stm32_crc_wrapper(stm, start, end - start, &crc_val)) {
+			fprintf(stderr, "Failed to read CRC\n");
+			goto close;
+		}
+		fprintf(diag, "CRC(0x%08x-0x%08x) = 0x%08x\n", start, end,
+			crc_val);
+		ret = 0;
+		goto close;
 	} else
 		ret = 0;
 
@@ -460,7 +474,7 @@ int main(int argc, char* argv[]) {
 
 int parse_options(int argc, char *argv[]) {
 	int c;
-	while ((c = getopt(argc, argv, "a:b:m:r:w:e:vn:g:jkfchuos:S:i:R")) != -1) {
+	while ((c = getopt(argc, argv, "a:b:m:r:w:e:vn:g:jkfcChuos:S:i:R")) != -1) {
 		switch(c) {
 			case 'a':
 				port_opts.bus_addr = strtoul(optarg, NULL, 0);
@@ -605,6 +619,10 @@ int parse_options(int argc, char *argv[]) {
 			case 'R':
 				reset_flag = 1;
 				break;
+
+			case 'C':
+				crc = 1;
+				break;
 		}
 	}
 
@@ -640,6 +658,7 @@ void show_help(char *name) {
 		"	-m mode		Serial port mode (default 8e1)\n"
 		"	-r filename	Read flash to file (or - stdout)\n"
 		"	-w filename	Write flash from file (or - stdout)\n"
+		"	-C		Compute CRC of flash content\n"
 		"	-u		Disable the flash write-protection\n"
 		"	-j		Enable the flash read-protection\n"
 		"	-k		Disable the flash read-protection\n"

stm32.c

@@ -742,3 +742,29 @@ uint32_t stm32_sw_crc(uint32_t crc, uint8_t *buf, unsigned int len)
 	}
 	return crc;
 }
+
+char stm32_crc_wrapper(const stm32_t *stm, uint32_t address, uint32_t length,
+		       uint32_t *crc)
+{
+	uint8_t buf[256];
+	uint32_t len, current_crc;
+
+	if (stm->cmd->crc != STM32_CMD_ERR)
+		return stm32_crc_memory(stm, address, length, crc);
+
+	current_crc = CRC_INIT_VALUE;
+	while (length) {
+		len = length > 256 ? 256 : length;
+		if (!stm32_read_memory(stm, address, buf, len)) {
+			fprintf(stderr,
+				"Failed to read memory at address 0x%08x, target write-protected?\n",
+				address);
+			return 0;
+		}
+		current_crc = stm32_sw_crc(current_crc, buf, len);
+		length -= len;
+		address += len;
+	}
+	*crc = current_crc;
+	return 1;
+}

stm32.h

@@ -62,6 +62,8 @@ char stm32_readprot_memory (const stm32_t *stm);
 char stm32_runprot_memory  (const stm32_t *stm);
 char stm32_crc_memory(const stm32_t *stm, uint32_t address, uint32_t length,
 		      uint32_t *crc);
+char stm32_crc_wrapper(const stm32_t *stm, uint32_t address, uint32_t length,
+		       uint32_t *crc);
 uint32_t stm32_sw_crc(uint32_t crc, uint8_t *buf, unsigned int len);
 
 #endif

stm32flash.1

@@ -3,7 +3,7 @@
 stm32flash \- flashing utility for STM32 and STM32W through UART or I2C
 .SH SYNOPSIS
 .B stm32flash
-.RB [ \-cfhjkouvR ]
+.RB [ \-cfhjkouvCR ]
 .RB [ \-a
 .IR bus_address ]
 .RB [ \-b
@@ -138,7 +138,7 @@ Specify flash page offset (0 = flash start).
 
 .TP
 .BI "\-S" " address" "[:" "length" "]"
-Specify start address and optionally length for read/write/erase operations.
+Specify start address and optionally length for read/write/erase/crc operations.
 
 .TP
 .B \-f
@@ -166,6 +166,14 @@ for the format of
 .I GPIO_string
 and further explanation).
 
+.TP
+.B \-C
+Specify to compute CRC on memory content.
+By default the CRC is computed on the whole flash content.
+Use
+.B "\-S"
+to provide different memory address range.
+
 .TP
 .B \-R
 Specify to reset the device at exit.