firehose: Increate program timeout for SPINOR

The ZLP for SPINOR writes has been measured to take up to 15 seconds to
complete, resulting in timeouts even with the new 10 second value.

Pass around the storage type and provide a longer timeout (double the
currently measured value) specifically for SPINOR.

Signed-off-by: Bjorn Andersson <[email protected]>

Author: quic-bjorande

firehose.c

@@ -437,10 +437,12 @@ static int firehose_erase(struct qdl_device *qdl, struct program *program)
 	return ret == FIREHOSE_ACK ? 0 : -1;
 }
 
-static int firehose_program(struct qdl_device *qdl, struct program *program, int fd)
+static int firehose_program(struct qdl_device *qdl, struct program *program,
+			    int fd, enum qdl_storage_type storage)
 {
 	unsigned int num_sectors;
 	unsigned int sector_size;
+	unsigned int zlp_timeout = 10000;
 	struct stat sb;
 	size_t chunk_size;
 	xmlNode *root;
@@ -454,6 +456,13 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
 	int n;
 	uint32_t fill_value;
 
+        /*
+	 * ZLP has been measured to take up to 15 seconds on SPINOR devices,
+         * let's double it to be on the safe side...
+	 */
+        if (storage == QDL_STORAGE_SPINOR)
+		zlp_timeout = 30000;
+
 	num_sectors = program->num_sectors;
 	sector_size = program->sector_size ? : qdl->sector_size;
 
@@ -568,7 +577,7 @@ static int firehose_program(struct qdl_device *qdl, struct program *program, int
 
 			vip_transfer_clear_status(qdl);
 		}
-		n = qdl_write(qdl, buf, chunk_size * sector_size, 30000);
+		n = qdl_write(qdl, buf, chunk_size * sector_size, zlp_timeout);
 		if (n < 0) {
 			ux_err("USB write failed for data chunk\n");
 			ret = firehose_read(qdl, 30000, firehose_generic_parser, NULL);
@@ -1012,7 +1021,7 @@ int firehose_run(struct qdl_device *qdl, enum qdl_storage_type storage)
 	if (ret)
 		return ret;
 
-	ret = program_execute(qdl, firehose_program);
+	ret = program_execute(qdl, firehose_program, storage);
 	if (ret)
 		return ret;
 

program.c

@@ -264,7 +264,12 @@ int program_load(const char *program_file, bool is_nand, bool allow_missing, con
 	return errors;
 }
 
-int program_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl, struct program *program, int fd))
+int program_execute(struct qdl_device *qdl,
+		    int (*apply)(struct qdl_device *qdl,
+				 struct program *program,
+				 int fd,
+				 enum qdl_storage_type storage),
+		    enum qdl_storage_type storage)
 {
 	struct program *program;
 	int ret;
@@ -281,7 +286,7 @@ int program_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl,
 			return -1;
 		}
 
-		ret = apply(qdl, program, fd);
+		ret = apply(qdl, program, fd, storage);
 		close(fd);
 		if (ret)
 			return ret;

program.h

@@ -32,9 +32,12 @@ struct program {
 };
 
 struct qdl_device;
+enum qdl_storage_type;
 
 int program_load(const char *program_file, bool is_nand, bool allow_missing, const char *incdir);
-int program_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl, struct program *program, int fd));
+int program_execute(struct qdl_device *qdl,
+		    int (*apply)(struct qdl_device *qdl, struct program *program, int fd, enum qdl_storage_type storage),
+		    enum qdl_storage_type storage);
 int erase_execute(struct qdl_device *qdl, int (*apply)(struct qdl_device *qdl, struct program *program));
 int program_find_bootable_partition(bool *multiple_found);
 int program_is_sec_partition_flashed(void);