ufs: Extract provisioning from firehose_run()

firehose_run() is clearly sequential, except if UFS provisioning is
taken place, then it's a completely different sequence and an early
return - almost like it's two separate functions crammed into one.

Split firehose_provision() from firehose_run() and make the decision in
qdl.c instead.

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

Author: quic-bjorande

firehose.c

@@ -932,6 +932,30 @@ static int firehose_reset(struct qdl_device *qdl)
 	return ret == FIREHOSE_ACK ? 0 : -1;
 }
 
+int firehose_provision(struct qdl_device *qdl)
+{
+	int ret;
+
+	firehose_read(qdl, 5000, firehose_generic_parser, NULL);
+
+	ret = firehose_configure(qdl, true, "ufs");
+	if (ret)
+		return ret;
+
+	ret = ufs_provisioning_execute(qdl, firehose_apply_ufs_common,
+				       firehose_apply_ufs_body,
+				       firehose_apply_ufs_epilogue);
+	if (!ret)
+		ux_info("UFS provisioning succeeded\n");
+	else
+		ux_info("UFS provisioning failed\n");
+
+	firehose_reset(qdl);
+
+	return ret;
+
+}
+
 int firehose_run(struct qdl_device *qdl, const char *storage)
 {
 	bool multiple;
@@ -942,23 +966,6 @@ int firehose_run(struct qdl_device *qdl, const char *storage)
 
 	firehose_read(qdl, 5000, firehose_generic_parser, NULL);
 
-	if (ufs_need_provisioning()) {
-		ret = firehose_configure(qdl, true, storage);
-		if (ret)
-			return ret;
-		ret = ufs_provisioning_execute(qdl, firehose_apply_ufs_common,
-					       firehose_apply_ufs_body,
-					       firehose_apply_ufs_epilogue);
-		if (!ret)
-			ux_info("UFS provisioning succeeded\n");
-		else
-			ux_info("UFS provisioning failed\n");
-
-		firehose_reset(qdl);
-
-		return ret;
-	}
-
 	ret = firehose_configure(qdl, false, storage);
 	if (ret)
 		return ret;

qdl.c

@@ -267,6 +267,9 @@ int main(int argc, char **argv)
 				errx(1, "read_op_load %s failed", argv[optind]);
 			break;
 		case QDL_FILE_UFS:
+			if (strcmp(storage, "ufs"))
+				errx(1, "attempting to load provisioning config when storage isn't \"ufs\"");
+
 			ret = ufs_load(argv[optind], qdl_finalize_provisioning);
 			if (ret < 0)
 				errx(1, "ufs_load %s failed", argv[optind]);
@@ -302,7 +305,10 @@ int main(int argc, char **argv)
 	if (ret < 0)
 		goto out_cleanup;
 
-	ret = firehose_run(qdl, storage);
+	if (ufs_need_provisioning())
+		ret = firehose_provision(qdl);
+	else
+		ret = firehose_run(qdl, storage);
 	if (ret < 0)
 		goto out_cleanup;
 

qdl.h

@@ -69,6 +69,7 @@ struct qdl_device *usb_init(void);
 struct qdl_device *sim_init(void);
 
 int firehose_run(struct qdl_device *qdl, const char *storage);
+int firehose_provision(struct qdl_device *qdl);
 int firehose_read_buf(struct qdl_device *qdl, struct read_op *read_op, void *out_buf, size_t out_size);
 int sahara_run(struct qdl_device *qdl, char *img_arr[], bool single_image,
 	       const char *ramdump_path, const char *ramdump_filter);