ffspart: Support flashing already ECC protected images

We do this by assuming filenames with '.ecc' in them are already ECC
protected.

This solves a practical problem in transitioning op-build to use ffspart
for pnor assembly rather than three perl scripts and a lot of XML.

We also update the ffspart tests to take into account ECC requirements.

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Reviewed-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

external/ffspart/ffspart.c

@@ -31,6 +31,7 @@
 #include <libflash/libflash.h>
 #include <libflash/libffs.h>
 #include <libflash/blocklevel.h>
+#include <libflash/ecc.h>
 #include <common/arch_flash.h>
 
 /*
@@ -250,6 +251,14 @@ static int parse_entry(struct blocklevel_device *bl,
 
 	if (*line != '\0' && *(line + 1) != '\0') {
 		filename = line + 1;
+
+		/*
+		 * Support flashing already ecc'd data as this is the case
+		 * for POWER8 SBE image binary.
+		 */
+		if (has_ecc(new_entry) && !strstr(filename, ".ecc"))
+			blocklevel_ecc_protect(bl, pbase, psize);
+
 		data_fd = open(filename, O_RDONLY);
 		if (data_fd == -1) {
 			fprintf(stderr, "Couldn't open file '%s' for '%s' partition "
@@ -269,9 +278,12 @@ static int parse_entry(struct blocklevel_device *bl,
 		 * Sanity check that the file isn't too large for
 		 * partition
 		 */
+		if (has_ecc(new_entry) && !strstr(filename, ".ecc"))
+			psize = ecc_buffer_size_minus_ecc(psize);
 		if (pactual > psize) {
-			fprintf(stderr, "File '%s' for partition '%s' is too large\n",
-					filename, name);
+			fprintf(stderr, "File '%s' for partition '%s' is too large,"
+				" %u > %u\n",
+				filename, name, pactual, psize);
 			close(data_fd);
 			return -1;
 		}

external/ffspart/test/results/07-big-files.err

@@ -1,4 +1,4 @@
 WARNING: Attempting to parse a partition line without any TOCs created.
          Generating a default TOC at zero
-File 'FILE_ONE' for partition 'ONE' is too large
+File 'FILE_ONE' for partition 'ONE' is too large, 257 > 227
 Failed to parse input file 'FILE' at line 1

external/ffspart/test/tests/04-tiny-pnor2

@@ -4,7 +4,7 @@ touch $DATA_DIR/$CUR_TEST.gen
 i=1;
 while [ $i -lt 5 ] ; do
 	j=0;
-	while [ $j -lt $((0x100)) ] ; do
+	while [ $j -lt $((0xe0)) ] ; do
 		echo -n "$i" >> $DATA_DIR/$CUR_TEST.$i;
 		j=$(expr $j + 1);
 	done

external/ffspart/test/tests/08-small-files

@@ -4,7 +4,7 @@ touch $DATA_DIR/$CUR_TEST.gen
 i=1;
 while [ $i -lt 5 ] ; do
 	j=0;
-	while [ $j -lt $((0xff)) ] ; do
+	while [ $j -lt $((0xe0)) ] ; do
 		echo -n "$i" >> $DATA_DIR/$CUR_TEST.$i;
 		j=$(expr $j + 1);
 	done