Skip to contentSkip to conversation

Improve user feedback in case of FPGA bitstream load failure

PATCH Superseded [email protected] 4 participants 10 messages Jun 26, 2025 – Jul 4, 2025

Subsystems (2)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover Improve user feedback in case of FPGA bitstream load failure

From: Pieter Van Trappen <[email protected]>

The main motivation for this patch series is to make the fpga * commands' return more explicit because simply returning the command usage without indicating the root cause is not helpful.

In addition, a the sandbox_defconfig was amended to facilitate compiling fpga-based sources and various style, compiler errors and warnings have been fixed.

v3:
* enable FPGA configs in sandbox_defconfig instead of new one

v2:
* use log_% instead of puts()
* harmonize user feedback format; remove useless strings
* add a sandbox_fpga_defconfig; amend fpga Kconfig
* fix various compiler errors and warnings

v1: initial version

Pieter Van Trappen (4):
Improve user feedback in case of FPGA bitstream load failure Amend drivers/fpga Kconfig for FPGA_SOCFPGA
Enable FPGA commands and drivers at sandbox_defconfig FPGA files - correct compiler errors and warnings

 cmd/fpga.c                | 101 ++++++++++++++---------------
 configs/sandbox_defconfig |  20 ++++++
 drivers/fpga/ACEX1K.c     |   1 +
 drivers/fpga/Kconfig      |   1 +
 drivers/fpga/ivm_core.c   |   1 +
 drivers/fpga/lattice.c    |   4 +-
 drivers/fpga/spartan2.c   |   1 +
 drivers/fpga/stratixII.c  | 131 +++++++++++++++++---------------------
 drivers/fpga/stratixv.c   |   2 +-
 drivers/fpga/versalpl.c   |   1 -
 drivers/fpga/virtex2.c    |   2 +
 drivers/fpga/zynqmppl.c   |   4 +-
 drivers/fpga/zynqpl.c     |   4 +-
 include/stratixII.h       |   6 +-
 14 files changed, 147 insertions(+), 132 deletions(-)

base-commit: 40e083353a1610276f12fdbe613bf12004452656

Signature · 1 line
2.48.1
#1 lore raw

PATCH v3 1/4 Improve user feedback in case of FPGA bitstream load failure

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

---
 cmd/fpga.c              | 99 +++++++++++++++++++++--------------------
 drivers/fpga/zynqmppl.c |  4 +-
 drivers/fpga/zynqpl.c   |  4 +-
 3 files changed, 54 insertions(+), 53 deletions(-)
cmd/fpga.c +50 -49
index 9dc7b63db5d..9cc51f04698 100644
@@ -28,7 +28,7 @@ static long do_fpga_get_device(char *arg)
 	if (dev == FPGA_INVALID_DEVICE && arg)
 		dev = simple_strtol(arg, NULL, 16);
 
-	debug("%s: device = %ld\n", __func__, dev);
+	log_debug("device = %ld\n", dev);
 
 	return dev;
 }
@@ -40,26 +40,26 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
 	size_t local_data_size;
 	long local_fpga_data;
 
-	debug("%s %d, %d\n", __func__, argc, cmdtp->maxargs);
+	log_debug("%d, %d\n", argc, cmdtp->maxargs);
 
 	if (argc != cmdtp->maxargs) {
-		debug("fpga: incorrect parameters passed\n");
-		return CMD_RET_USAGE;
+		log_err("Incorrect number of parameters passed\n");
+		return CMD_RET_FAILURE;
 	}
 
 	*dev = do_fpga_get_device(argv[0]);
 
 	local_fpga_data = simple_strtol(argv[1], NULL, 16);
 	if (!local_fpga_data) {
-		debug("fpga: zero fpga_data address\n");
-		return CMD_RET_USAGE;
+		log_err("Zero fpga_data address\n");
+		return CMD_RET_FAILURE;
 	}
 	*fpga_data = local_fpga_data;
 
 	local_data_size = hextoul(argv[2], NULL);
 	if (!local_data_size) {
-		debug("fpga: zero size\n");
-		return CMD_RET_USAGE;
+		log_err("Zero size\n");
+		return CMD_RET_FAILURE;
 	}
 	*data_size = local_data_size;
 
@@ -70,51 +70,52 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
 static int do_fpga_loads(struct cmd_tbl *cmdtp, int flag, int argc,
 			 char *const argv[])
 {
+	struct fpga_secure_info fpga_sec_info;
+	const int pos_userkey = 5;
 	size_t data_size = 0;
 	long fpga_data, dev;
 	int ret;
-	struct fpga_secure_info fpga_sec_info;
 
 	memset(&fpga_sec_info, 0, sizeof(fpga_sec_info));
 
-	if (argc < 5) {
-		debug("fpga: incorrect parameters passed\n");
-		return CMD_RET_USAGE;
+	if (argc < pos_userkey) {
+		log_err("Too few parameters passed\n");
+		return CMD_RET_FAILURE;
 	}
 
-	if (argc == 6)
+	if (argc == pos_userkey + 1)
 		fpga_sec_info.userkey_addr = (u8 *)(uintptr_t)
-					      simple_strtoull(argv[5],
+					      simple_strtoull(argv[pos_userkey],
 							      NULL, 16);
 	else
 		/*
 		 * If 6th parameter is not passed then do_fpga_check_params
 		 * will get 5 instead of expected 6 which means that function
-		 * return CMD_RET_USAGE. Increase number of params +1 to pass
+		 * return CMD_RET_FAILURE. Increase number of params +1 to pass
 		 * this.
 		 */
 		argc++;
 
+	ret = do_fpga_check_params(&dev, &fpga_data, &data_size,
+				   cmdtp, argc, argv);
+	if (ret)
+		return ret;
+
 	fpga_sec_info.encflag = (u8)hextoul(argv[4], NULL);
 	fpga_sec_info.authflag = (u8)hextoul(argv[3], NULL);
 
 	if (fpga_sec_info.authflag >= FPGA_NO_ENC_OR_NO_AUTH &&
 	    fpga_sec_info.encflag >= FPGA_NO_ENC_OR_NO_AUTH) {
-		debug("fpga: Use <fpga load> for NonSecure bitstream\n");
-		return CMD_RET_USAGE;
+		log_err("Use <fpga load> for NonSecure bitstream\n");
+		return CMD_RET_FAILURE;
 	}
 
 	if (fpga_sec_info.encflag == FPGA_ENC_USR_KEY &&
 	    !fpga_sec_info.userkey_addr) {
-		debug("fpga: User key not provided\n");
-		return CMD_RET_USAGE;
+		log_err("User key not provided\n");
+		return CMD_RET_FAILURE;
 	}
 
-	ret = do_fpga_check_params(&dev, &fpga_data, &data_size,
-				   cmdtp, argc, argv);
-	if (ret)
-		return ret;
-
 	return fpga_loads(dev, (void *)fpga_data, data_size, &fpga_sec_info);
 }
 #endif
@@ -245,23 +246,23 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 	ulong dev = do_fpga_get_device(argv[0]);
 	char *datastr = env_get("fpgadata");
 
-	debug("fpga: argc %x, dev %lx, datastr %s\n", argc, dev, datastr);
+	log_debug("argc %x, dev %lx, datastr %s\n", argc, dev, datastr);
 
 	if (dev == FPGA_INVALID_DEVICE) {
-		debug("fpga: Invalid fpga device\n");
-		return CMD_RET_USAGE;
+		log_err("Invalid fpga device\n");
+		return CMD_RET_FAILURE;
 	}
 
 	if (argc == 0 && !datastr) {
-		debug("fpga: No datastr passed\n");
-		return CMD_RET_USAGE;
+		log_err("No datastr passed\n");
+		return CMD_RET_FAILURE;
 	}
 
 	if (argc == 2) {
 		datastr = argv[1];
-		debug("fpga: Full command with two args\n");
+		log_debug("Full command with two args\n");
 	} else if (argc == 1 && !datastr) {
-		debug("fpga: Dev is setup - fpgadata passed\n");
+		log_debug("Dev is setup - fpgadata passed\n");
 		datastr = argv[0];
 	}
 
@@ -269,20 +270,20 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 	if (fit_parse_subimage(datastr, (ulong)fpga_data,
 			       &fit_addr, &fit_uname)) {
 		fpga_data = (void *)fit_addr;
-		debug("*  fpga: subimage '%s' from FIT image ",
-		      fit_uname);
-		debug("at 0x%08lx\n", fit_addr);
+		log_debug("*  fpga: subimage '%s' from FIT image ",
+			  fit_uname);
+		log_debug("at 0x%08lx\n", fit_addr);
 	} else
 #endif
 	{
 		fpga_data = (void *)hextoul(datastr, NULL);
-		debug("*  fpga: cmdline image address = 0x%08lx\n",
-		      (ulong)fpga_data);
+		log_debug("*  fpga: cmdline image address = 0x%08lx\n",
+			  (ulong)fpga_data);
 	}
-	debug("%s: fpga_data = 0x%lx\n", __func__, (ulong)fpga_data);
+	log_debug("fpga_data = 0x%lx\n", (ulong)fpga_data);
 	if (!fpga_data) {
-		puts("Zero fpga_data address\n");
-		return CMD_RET_USAGE;
+		log_err("Zero fpga_data address\n");
+		return CMD_RET_FAILURE;
 	}
 
 	switch (genimg_get_format(fpga_data)) {
@@ -303,13 +304,13 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 
 			if (gunzip((void *)data, ~0UL, (void *)image_buf,
 				   &image_size) != 0) {
-				puts("GUNZIP: error\n");
+				log_err("Gunzip error\n");
 				return CMD_RET_FAILURE;
 			}
 			data_size = image_size;
 #else
-			puts("Gunzip image is not supported\n");
-			return 1;
+			log_err("Gunzip image is not supported\n");
+			return CMD_RET_FAILURE;
 #endif
 		} else {
 			data = (ulong)image_get_data(hdr);
@@ -327,12 +328,12 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 		const void *fit_data;
 
 		if (!fit_uname) {
-			puts("No FIT subimage unit name\n");
+			log_err("No FIT subimage unit name\n");
 			return CMD_RET_FAILURE;
 		}
 
 		if (fit_check_format(fit_hdr, IMAGE_SIZE_INVAL)) {
-			puts("Bad FIT image format\n");
+			log_err("Bad FIT image format\n");
 			return CMD_RET_FAILURE;
 		}
 
@@ -348,7 +349,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 	}
 #endif
 	default:
-		puts("** Unknown image type\n");
+		log_err("Unknown image type\n");
 		return CMD_RET_FAILURE;
 	}
 }
@@ -390,16 +391,16 @@ static int do_fpga_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
 	fpga_cmd = find_cmd_tbl(argv[1], fpga_commands,
 				ARRAY_SIZE(fpga_commands));
 	if (!fpga_cmd) {
-		debug("fpga: non existing command\n");
-		return CMD_RET_USAGE;
+		log_err("Non existing command\n");
+		return CMD_RET_FAILURE;
 	}
 
 	argc -= 2;
 	argv += 2;
 
 	if (argc > fpga_cmd->maxargs) {
-		debug("fpga: more parameters passed\n");
-		return CMD_RET_USAGE;
+		log_err("Too many parameters passed\n");
+		return CMD_RET_FAILURE;
 	}
 
 	ret = fpga_cmd->cmd(fpga_cmd, flag, argc, argv);
drivers/fpga/zynqmppl.c +2 -2
index 2b62bbbe3cf..1199b249e36 100644
@@ -191,8 +191,8 @@ static int zynqmp_validate_bitstream(xilinx_desc *desc, const void *buf,
 	}
 
 	if ((ulong)buf < SZ_1M) {
-		printf("%s: Bitstream has to be placed up to 1MB (%px)\n",
-		       __func__, buf);
+		log_err("Bitstream has to be placed above 1MB (%px)\n",
+			buf);
 		return FPGA_FAIL;
 	}
 
drivers/fpga/zynqpl.c +2 -2
index 3e86d854a01..a8ca015a8a6 100644
@@ -360,8 +360,8 @@ static int zynq_validate_bitstream(xilinx_desc *desc, const void *buf,
 	}
 
 	if ((u32)buf < SZ_1M) {
-		printf("%s: Bitstream has to be placed up to 1MB (%x)\n",
-		       __func__, (u32)buf);
+		log_err("Bitstream has to be placed above 1MB (%px)\n",
+			(u32)buf);
 		return FPGA_FAIL;
 	}
 
Signature · 1 line
2.48.1
maintainer
#2 lore raw
Quoted 279 lines · On 6/26/25 11:35, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

---
  cmd/fpga.c              | 99 +++++++++++++++++++++--------------------
  drivers/fpga/zynqmppl.c |  4 +-
  drivers/fpga/zynqpl.c   |  4 +-
  3 files changed, 54 insertions(+), 53 deletions(-)
cmd/fpga.c +50 -49
index 9dc7b63db5d..9cc51f04698 100644
@@ -28,7 +28,7 @@ static long do_fpga_get_device(char *arg)
  	if (dev == FPGA_INVALID_DEVICE && arg)
  		dev = simple_strtol(arg, NULL, 16);
 
-	debug("%s: device = %ld\n", __func__, dev);
+	log_debug("device = %ld\n", dev);
 
  	return dev;
  }
@@ -40,26 +40,26 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
  	size_t local_data_size;
  	long local_fpga_data;
 
-	debug("%s %d, %d\n", __func__, argc, cmdtp->maxargs);
+	log_debug("%d, %d\n", argc, cmdtp->maxargs);
 
  	if (argc != cmdtp->maxargs) {
-		debug("fpga: incorrect parameters passed\n");
-		return CMD_RET_USAGE;
+		log_err("Incorrect number of parameters passed\n");
+		return CMD_RET_FAILURE;
  	}
 
  	*dev = do_fpga_get_device(argv[0]);
 
  	local_fpga_data = simple_strtol(argv[1], NULL, 16);
  	if (!local_fpga_data) {
-		debug("fpga: zero fpga_data address\n");
-		return CMD_RET_USAGE;
+		log_err("Zero fpga_data address\n");
+		return CMD_RET_FAILURE;
  	}
  	*fpga_data = local_fpga_data;
 
  	local_data_size = hextoul(argv[2], NULL);
  	if (!local_data_size) {
-		debug("fpga: zero size\n");
-		return CMD_RET_USAGE;
+		log_err("Zero size\n");
+		return CMD_RET_FAILURE;
  	}
  	*data_size = local_data_size;
 
@@ -70,51 +70,52 @@ static int do_fpga_check_params(long *dev, long *fpga_data, size_t *data_size,
  static int do_fpga_loads(struct cmd_tbl *cmdtp, int flag, int argc,
  			 char *const argv[])
  {
+	struct fpga_secure_info fpga_sec_info;
+	const int pos_userkey = 5;
  	size_t data_size = 0;
  	long fpga_data, dev;
  	int ret;
-	struct fpga_secure_info fpga_sec_info;
 
  	memset(&fpga_sec_info, 0, sizeof(fpga_sec_info));
 
-	if (argc < 5) {
-		debug("fpga: incorrect parameters passed\n");
-		return CMD_RET_USAGE;
+	if (argc < pos_userkey) {
+		log_err("Too few parameters passed\n");
+		return CMD_RET_FAILURE;
  	}
 
-	if (argc == 6)
+	if (argc == pos_userkey + 1)
  		fpga_sec_info.userkey_addr = (u8 *)(uintptr_t)
-					      simple_strtoull(argv[5],
+					      simple_strtoull(argv[pos_userkey],
  							      NULL, 16);
  	else
  		/*
  		 * If 6th parameter is not passed then do_fpga_check_params
  		 * will get 5 instead of expected 6 which means that function
-		 * return CMD_RET_USAGE. Increase number of params +1 to pass
+		 * return CMD_RET_FAILURE. Increase number of params +1 to pass
  		 * this.
  		 */
  		argc++;
 
+	ret = do_fpga_check_params(&dev, &fpga_data, &data_size,
+				   cmdtp, argc, argv);
+	if (ret)
+		return ret;
+
  	fpga_sec_info.encflag = (u8)hextoul(argv[4], NULL);
  	fpga_sec_info.authflag = (u8)hextoul(argv[3], NULL);
 
  	if (fpga_sec_info.authflag >= FPGA_NO_ENC_OR_NO_AUTH &&
  	    fpga_sec_info.encflag >= FPGA_NO_ENC_OR_NO_AUTH) {
-		debug("fpga: Use <fpga load> for NonSecure bitstream\n");
-		return CMD_RET_USAGE;
+		log_err("Use <fpga load> for NonSecure bitstream\n");
+		return CMD_RET_FAILURE;
  	}
 
  	if (fpga_sec_info.encflag == FPGA_ENC_USR_KEY &&
  	    !fpga_sec_info.userkey_addr) {
-		debug("fpga: User key not provided\n");
-		return CMD_RET_USAGE;
+		log_err("User key not provided\n");
+		return CMD_RET_FAILURE;
  	}
 
-	ret = do_fpga_check_params(&dev, &fpga_data, &data_size,
-				   cmdtp, argc, argv);
-	if (ret)
-		return ret;
-
  	return fpga_loads(dev, (void *)fpga_data, data_size, &fpga_sec_info);
  }
  #endif
@@ -245,23 +246,23 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
  	ulong dev = do_fpga_get_device(argv[0]);
  	char *datastr = env_get("fpgadata");
 
-	debug("fpga: argc %x, dev %lx, datastr %s\n", argc, dev, datastr);
+	log_debug("argc %x, dev %lx, datastr %s\n", argc, dev, datastr);
 
  	if (dev == FPGA_INVALID_DEVICE) {
-		debug("fpga: Invalid fpga device\n");
-		return CMD_RET_USAGE;
+		log_err("Invalid fpga device\n");
+		return CMD_RET_FAILURE;
  	}
 
  	if (argc == 0 && !datastr) {
-		debug("fpga: No datastr passed\n");
-		return CMD_RET_USAGE;
+		log_err("No datastr passed\n");
+		return CMD_RET_FAILURE;
  	}
 
  	if (argc == 2) {
  		datastr = argv[1];
-		debug("fpga: Full command with two args\n");
+		log_debug("Full command with two args\n");
  	} else if (argc == 1 && !datastr) {
-		debug("fpga: Dev is setup - fpgadata passed\n");
+		log_debug("Dev is setup - fpgadata passed\n");
  		datastr = argv[0];
  	}
 
@@ -269,20 +270,20 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
  	if (fit_parse_subimage(datastr, (ulong)fpga_data,
  			       &fit_addr, &fit_uname)) {
  		fpga_data = (void *)fit_addr;
-		debug("*  fpga: subimage '%s' from FIT image ",
-		      fit_uname);
-		debug("at 0x%08lx\n", fit_addr);
+		log_debug("*  fpga: subimage '%s' from FIT image ",
+			  fit_uname);
+		log_debug("at 0x%08lx\n", fit_addr);
  	} else
  #endif
  	{
  		fpga_data = (void *)hextoul(datastr, NULL);
-		debug("*  fpga: cmdline image address = 0x%08lx\n",
-		      (ulong)fpga_data);
+		log_debug("*  fpga: cmdline image address = 0x%08lx\n",
+			  (ulong)fpga_data);
  	}
-	debug("%s: fpga_data = 0x%lx\n", __func__, (ulong)fpga_data);
+	log_debug("fpga_data = 0x%lx\n", (ulong)fpga_data);
  	if (!fpga_data) {
-		puts("Zero fpga_data address\n");
-		return CMD_RET_USAGE;
+		log_err("Zero fpga_data address\n");
+		return CMD_RET_FAILURE;
  	}
 
  	switch (genimg_get_format(fpga_data)) {
@@ -303,13 +304,13 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 
  			if (gunzip((void *)data, ~0UL, (void *)image_buf,
  				   &image_size) != 0) {
-				puts("GUNZIP: error\n");
+				log_err("Gunzip error\n");
  				return CMD_RET_FAILURE;
  			}
  			data_size = image_size;
  #else
-			puts("Gunzip image is not supported\n");
-			return 1;
+			log_err("Gunzip image is not supported\n");
+			return CMD_RET_FAILURE;
  #endif
  		} else {
  			data = (ulong)image_get_data(hdr);
@@ -327,12 +328,12 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
  		const void *fit_data;
 
  		if (!fit_uname) {
-			puts("No FIT subimage unit name\n");
+			log_err("No FIT subimage unit name\n");
  			return CMD_RET_FAILURE;
  		}
 
  		if (fit_check_format(fit_hdr, IMAGE_SIZE_INVAL)) {
-			puts("Bad FIT image format\n");
+			log_err("Bad FIT image format\n");
  			return CMD_RET_FAILURE;
  		}
 
@@ -348,7 +349,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
  	}
  #endif
  	default:
-		puts("** Unknown image type\n");
+		log_err("Unknown image type\n");
  		return CMD_RET_FAILURE;
  	}
  }
@@ -390,16 +391,16 @@ static int do_fpga_wrapper(struct cmd_tbl *cmdtp, int flag, int argc,
  	fpga_cmd = find_cmd_tbl(argv[1], fpga_commands,
  				ARRAY_SIZE(fpga_commands));
  	if (!fpga_cmd) {
-		debug("fpga: non existing command\n");
-		return CMD_RET_USAGE;
+		log_err("Non existing command\n");
+		return CMD_RET_FAILURE;
  	}
 
  	argc -= 2;
  	argv += 2;
 
  	if (argc > fpga_cmd->maxargs) {
-		debug("fpga: more parameters passed\n");
-		return CMD_RET_USAGE;
+		log_err("Too many parameters passed\n");
+		return CMD_RET_FAILURE;
  	}
 
  	ret = fpga_cmd->cmd(fpga_cmd, flag, argc, argv);
drivers/fpga/zynqmppl.c +2 -2
index 2b62bbbe3cf..1199b249e36 100644
@@ -191,8 +191,8 @@ static int zynqmp_validate_bitstream(xilinx_desc *desc, const void *buf,
  	}
 
  	if ((ulong)buf < SZ_1M) {
-		printf("%s: Bitstream has to be placed up to 1MB (%px)\n",
-		       __func__, buf);
+		log_err("Bitstream has to be placed above 1MB (%px)\n",
+			buf);
  		return FPGA_FAIL;
  	}
 
drivers/fpga/zynqpl.c +0 -0
index 3e86d854a01..a8ca015a8a6 100644

drivers/fpga/zynqpl.c static int zynq_validate_bitstream(xilinx_desc *desc, const void *buf, · line 367

Quoted 10 lines
drivers/fpga/zynqpl.c +2 -2
@@ -360,8 +360,8 @@ static int zynq_validate_bitstream(xilinx_desc *desc, const void *buf,
  	}
 
  	if ((u32)buf < SZ_1M) {
-		printf("%s: Bitstream has to be placed up to 1MB (%x)\n",
-		       __func__, (u32)buf);
+		log_err("Bitstream has to be placed above 1MB (%px)\n",
+			(u32)buf);
  		return FPGA_FAIL;
  	}
 

I would be the best if you can create also cover letter.
But let me reply to this patch but issue is likely related to others. I am also not in CC on 3/4.

Anyway CI is failing with

$ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE}
Building current source for 1 boards (1 thread, 64 jobs per thread)
   sandbox:  +   sandbox
+drivers/fpga/fpga.c:23:13: error: ‘fpga_no_sup’ defined but not used [-Werror=unused-function]
+   23 | static void fpga_no_sup(char *fn, char *msg)
+      |             ^~~~~~~~~~~
+cc1: all warnings being treated as errors
+make[3]: *** [scripts/Makefile.build:249: drivers/fpga/fpga.o] Error 1
+make[2]: *** [scripts/Makefile.build:388: drivers/fpga] Error 2
+make[1]: *** [Makefile:1930: drivers] Error 2

which should be fixed.

Second thing is that all of your subjects are missing prefixes.
That's why please use fpga: or cmd: fpga: there to see subsystems you are targetting.

Thakns,
Michal

#3 lore raw
Quoted 22 lines · Michal Simek
Quoted 14 lines · On 6/26/25 11:35, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

Quoted 6 lines

---
  cmd/fpga.c              | 99 +++++++++++++++++++++-------------------- drivers/fpga/zynqmppl.c |  4 +-
  drivers/fpga/zynqpl.c   |  4 +-

  3 files changed, 54 insertions(+), 53 deletions(-)
Quoted 2 lines

I would be the best if you can create also cover letter.
But let me reply to this patch but issue is likely related to others. I am also not in CC on 3/4.

Hi Michal, well there's a cover letter (v3 0/4) but it's only been sent to the mailing list cause for the actual patches I use the get_maintainer.pl script (only). Probably also the reason why the 3/4 patch, amending the sandbox_defconfig, didn't reach you. I'll make sure all v4 patches are sent to you.

Quoted 13 lines

Anyway CI is failing with

$ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e -- board ${TEST_PY_BD} ${OVERRIDE}
Building current source for 1 boards (1 thread, 64 jobs per thread)
    sandbox:  +   sandbox
+drivers/fpga/fpga.c:23:13: error: ‘fpga_no_sup’ defined but not used [- 
Werror=unused-function]
+   23 | static void fpga_no_sup(char *fn, char *msg)
+      |             ^~~~~~~~~~~
(quoted diff) +4 -0
+cc1: all warnings being treated as errors
+make[3]: *** [scripts/Makefile.build:249: drivers/fpga/fpga.o] Error 1
+make[2]: *** [scripts/Makefile.build:388: drivers/fpga] Error 2
+make[1]: *** [Makefile:1930: drivers] Error 2
Quoted 1 line

which should be fixed.

OK I can fix this. Where does this CI job run? Also do you know if there a reason why not all -Werror options are on by default in the Makefile (KBUILD_CFLAGS) while they are on for the CI?

Quoted 5 lines

Second thing is that all of your subjects are missing prefixes.
That's why please use fpga: or cmd: fpga: there to see subsystems you are targetting.

Thakns,
Michal

Indeed I missed this requirement - I'll make sure to use these for v4.

Thanks, Pieter

maintainer
#4 lore raw
Quoted 41 lines · Pieter Van Trappen
Quoted 22 lines · Michal Simek
Quoted 14 lines · On 6/26/25 11:35, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

Quoted 6 lines

---
  cmd/fpga.c              | 99 +++++++++++++++++++++-------------------- drivers/fpga/zynqmppl.c |  4 +-
  drivers/fpga/zynqpl.c   |  4 +-

  3 files changed, 54 insertions(+), 53 deletions(-)
Quoted 2 lines

I would be the best if you can create also cover letter.
But let me reply to this patch but issue is likely related to others. I am also not in CC on 3/4.

Hi Michal, well there's a cover letter (v3 0/4) but it's only been sent to the mailing list cause for the actual patches I use the get_maintainer.pl script (only). Probably also the reason why the 3/4 patch, amending the sandbox_defconfig, didn't reach you. I'll make sure all v4 patches are sent to you.

Quoted 13 lines

Anyway CI is failing with

$ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e -- board ${TEST_PY_BD} ${OVERRIDE}
Building current source for 1 boards (1 thread, 64 jobs per thread)
    sandbox:  +   sandbox
+drivers/fpga/fpga.c:23:13: error: ‘fpga_no_sup’ defined but not used [- 
Werror=unused-function]
+   23 | static void fpga_no_sup(char *fn, char *msg)
+      |             ^~~~~~~~~~~
(quoted diff) +4 -0
+cc1: all warnings being treated as errors
+make[3]: *** [scripts/Makefile.build:249: drivers/fpga/fpga.o] Error 1
+make[2]: *** [scripts/Makefile.build:388: drivers/fpga] Error 2
+make[1]: *** [Makefile:1930: drivers] Error 2
Quoted 3 lines
Quoted 1 line

which should be fixed.

OK I can fix this. Where does this CI job run? Also do you know if there a reason why not all -Werror options are on by default in the Makefile (KBUILD_CFLAGS) while they are on for the CI?

As far as I know we have two pipelines. One in Azure and another via gitlab. I do use gitlab one as the part of source.denx.de.

I can't see any platform which has WERROR enabled by default.

M

30 config WERROR
31 bool "Compile U-Boot with warnings as errors"
32 help
33 A U-Boot build should not cause any compiler warnings, and this
34 enables the '-Werror' flag to enforce that rule.
35

 36           However, if you have a new (or very old) compiler or linker with odd
 37           and unusual warnings, or you have some architecture with problems,
 38           you may need to disable this config option in order to
 39           successfully build U-Boot.
#5 lore raw
Quoted 69 lines · Michal Simek
Quoted 47 lines · Pieter Van Trappen
Quoted 22 lines · Michal Simek
Quoted 14 lines · On 6/26/25 11:35, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

Quoted 6 lines

---
  cmd/fpga.c              | 99 +++++++++++++++++++++-------------------- drivers/fpga/zynqmppl.c |  4 +-
  drivers/fpga/zynqpl.c   |  4 +-

  3 files changed, 54 insertions(+), 53 deletions(-)
Quoted 3 lines

I would be the best if you can create also cover letter. But let me reply to this patch but issue is likely related to others. I am also not in CC on 3/4.

Hi Michal, well there's a cover letter (v3 0/4) but it's only been sent to the mailing list cause for the actual patches I use the get_maintainer.pl script (only). Probably also the reason why the 3/4 patch, amending the sandbox_defconfig, didn't reach you. I'll make sure all v4 patches are sent to you.

Quoted 14 lines

Anyway CI is failing with

$ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
-- board ${TEST_PY_BD} ${OVERRIDE}
Building current source for 1 boards (1 thread, 64 jobs per thread)
    sandbox:  +   sandbox
+drivers/fpga/fpga.c:23:13: error: ‘fpga_no_sup’ defined but not
used [- Werror=unused-function]
+   23 | static void fpga_no_sup(char *fn, char *msg)
+      |             ^~~~~~~~~~~
(quoted diff) +4 -0
+cc1: all warnings being treated as errors
+make[3]: *** [scripts/Makefile.build:249: drivers/fpga/fpga.o] Error 1
+make[2]: *** [scripts/Makefile.build:388: drivers/fpga] Error 2
+make[1]: *** [Makefile:1930: drivers] Error 2
Quoted 5 lines
Quoted 1 line

which should be fixed.

OK I can fix this. Where does this CI job run? Also do you know if there a reason why not all -Werror options are on by default in the Makefile (KBUILD_CFLAGS) while they are on for the CI?

As far as I know we have two pipelines. One in Azure and another via gitlab. I do use gitlab one as the part of source.denx.de.

I can't see any platform which has WERROR enabled by default.

M

30 config WERROR
31 bool "Compile U-Boot with warnings as errors"
32 help
33 A U-Boot build should not cause any compiler warnings, and this
34 enables the '-Werror' flag to enforce that rule.
35

Quoted 5 lines
 36           However, if you have a new (or very old) compiler or linker with odd
 37           and unusual warnings, or you have some architecture with problems,
 38           you may need to disable this config option in order to
 39           successfully build U-Boot.

We've had -Werror being passed in CI, via buildman for basically forever, but only recently added the WERROR Kconfig option to make it easier for the non-buildman flow to also use it.

Signature · 1 line
Tom
#6 lore raw
Quoted 76 lines · Tom Rini
Quoted 69 lines · Michal Simek
Quoted 47 lines · Pieter Van Trappen
Quoted 22 lines · Michal Simek
Quoted 14 lines · On 6/26/25 11:35, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

In cmd/fpga.c, change some debug calls to log_err for important user feedback and use CMD_RET_FAILURE in favor of CMD_RET_USAGE due to its long output which hides the actual, useful return message. Change the remaining debug calls to log_debug. Remove all 'fpga:' and __func__ strings as log_* has this covered.

For do_fpga_loads, move up the do_fpga_check_params call for more consistent command output; use a constant instead of multiple '5' use.

In drivers/fpga/zynq*.c, change 'up to' to 'above' which corrects this confusing/wrong statement.

Quoted 6 lines
---
   cmd/fpga.c              | 99 +++++++++++++++++++++--------------------
   drivers/fpga/zynqmppl.c |  4 +-
   drivers/fpga/zynqpl.c   |  4 +-
   3 files changed, 54 insertions(+), 53 deletions(-)
Quoted 3 lines

I would be the best if you can create also cover letter. But let me reply to this patch but issue is likely related to others. I am also not in CC on 3/4.

Hi Michal, well there's a cover letter (v3 0/4) but it's only been sent to the mailing list cause for the actual patches I use the get_maintainer.pl script (only). Probably also the reason why the 3/4 patch, amending the sandbox_defconfig, didn't reach you. I'll make sure all v4 patches are sent to you.

Quoted 14 lines

Anyway CI is failing with

$ tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e
-- board ${TEST_PY_BD} ${OVERRIDE}
Building current source for 1 boards (1 thread, 64 jobs per thread)
     sandbox:  +   sandbox
+drivers/fpga/fpga.c:23:13: error: ‘fpga_no_sup’ defined but not
used [- Werror=unused-function]
+   23 | static void fpga_no_sup(char *fn, char *msg)
+      |             ^~~~~~~~~~~
(quoted diff) +4 -0
+cc1: all warnings being treated as errors
+make[3]: *** [scripts/Makefile.build:249: drivers/fpga/fpga.o] Error 1
+make[2]: *** [scripts/Makefile.build:388: drivers/fpga] Error 2
+make[1]: *** [Makefile:1930: drivers] Error 2
Quoted 5 lines
Quoted 1 line

which should be fixed.

OK I can fix this. Where does this CI job run? Also do you know if there a reason why not all -Werror options are on by default in the Makefile (KBUILD_CFLAGS) while they are on for the CI?

As far as I know we have two pipelines. One in Azure and another via gitlab. I do use gitlab one as the part of source.denx.de.

I can't see any platform which has WERROR enabled by default.

M

30 config WERROR
31 bool "Compile U-Boot with warnings as errors"
32 help
33 A U-Boot build should not cause any compiler warnings, and this
34 enables the '-Werror' flag to enforce that rule.
35

Quoted 5 lines
  36           However, if you have a new (or very old) compiler or linker with odd
  37           and unusual warnings, or you have some architecture with problems,
  38           you may need to disable this config option in order to
  39           successfully build U-Boot.
Quoted 3 lines

We've had -Werror being passed in CI, via buildman for basically forever, but only recently added the WERROR Kconfig option to make it easier for the non-buildman flow to also use it.

Thanks for the explanation, that helps understanding the difference between the Makefile and buildman -E used with CI, in addition to the WERROR help section. To me, and for the sake of other first contributors, it would make sense to switch Werror on by default but this has a larger impact and would probably break other workflows.

Cheers, Pieter

#7 lore raw

PATCH v3 2/4 Amend drivers/fpga Kconfig for FPGA_SOCFPGA

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

FPGA_SOCFPGA requires ARCH_SOCFPGA cause socfpga.c contains arch/arm/mach-socfpga/* include macros.

---
 drivers/fpga/Kconfig | 1 +
 1 file changed, 1 insertion(+)
drivers/fpga/Kconfig +1 -0
index 62cb77b098c..9456ca3149a 100644
@@ -15,6 +15,7 @@ config FPGA_ALTERA
 
 config FPGA_SOCFPGA
 	bool "Enable Gen5 and Arria10 common FPGA drivers"
+	depends on ARCH_SOCFPGA
 	select FPGA_ALTERA
 	help
 	  Say Y here to enable the Gen5 and Arria10 common FPGA driver
Signature · 1 line
2.48.1
#8 lore raw

PATCH v3 3/4 Enable FPGA commands and drivers at sandbox_defconfig

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

Enable to facilitate compiler checks on most FPGA-related sources.

---
 configs/sandbox_defconfig | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
configs/sandbox_defconfig +20 -0
index 4f6943d1a4b..a64e208ad89 100644
@@ -78,6 +78,11 @@ CONFIG_CMD_MX_CYCLIC=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DEMO=y
+CONFIG_CMD_FPGA_LOADP=y
+CONFIG_CMD_FPGA_LOADBP=y
+CONFIG_CMD_FPGA_LOADFS=y
+CONFIG_CMD_FPGA_LOADMK=y
+CONFIG_CMD_FPGA_LOAD_SECURE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPIO_READ=y
 CONFIG_CMD_PWM=y
@@ -196,6 +201,21 @@ CONFIG_SANDBOX_DMA=y
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_ARM_FFA_TRANSPORT=y
+CONFIG_FPGA_ALTERA=y
+CONFIG_FPGA_STRATIX_II=y
+CONFIG_FPGA_STRATIX_V=y
+CONFIG_FPGA_ACEX1K=y
+CONFIG_FPGA_CYCLON2=y
+CONFIG_FPGA_LATTICE=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_VERSALPL=y
+CONFIG_FPGA_SPARTAN2=y
+CONFIG_FPGA_SPARTAN3=y
+CONFIG_FPGA_VIRTEX2=y
+CONFIG_SYS_FPGA_CHECK_BUSY=y
+CONFIG_SYS_FPGA_CHECK_CTRLC=y
+CONFIG_DM_FPGA=y
+CONFIG_SANDBOX_FPGA=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_GPIO_LOOKUP_LABEL=y
 CONFIG_QCOM_PMIC_GPIO=y
Signature · 1 line
2.48.1
#9 lore raw

PATCH v3 4/4 FPGA files - correct compiler errors and warnings

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

Errors reported by GCC 14.2 when using the amended sandbox_defconfig, now with FPGA commands and drivers. Also many style fixes as reported by checkpatch.pl on the diffs. Most changes in stratixII.c which has been reorganized as well to avoid the top function prototypes.

No functional changes.

---
 cmd/fpga.c               |   2 +-
 drivers/fpga/ACEX1K.c    |   1 +
 drivers/fpga/ivm_core.c  |   1 +
 drivers/fpga/lattice.c   |   4 +-
 drivers/fpga/spartan2.c  |   1 +
 drivers/fpga/stratixII.c | 131 ++++++++++++++++++---------------------
 drivers/fpga/stratixv.c  |   2 +-
 drivers/fpga/versalpl.c  |   1 -
 drivers/fpga/virtex2.c   |   2 +
 include/stratixII.h      |   6 +-
 10 files changed, 72 insertions(+), 79 deletions(-)
cmd/fpga.c +1 -1
index 9cc51f04698..d51c380d7b3 100644
@@ -302,7 +302,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc,
 
 			data = image_get_load(hdr);
 
-			if (gunzip((void *)data, ~0UL, (void *)image_buf,
+			if (gunzip((void *)data, ~0U, (void *)image_buf,
 				   &image_size) != 0) {
 				log_err("Gunzip error\n");
 				return CMD_RET_FAILURE;
drivers/fpga/ACEX1K.c +1 -0
index 3de9011ac06..e1514fc56d0 100644
@@ -14,6 +14,7 @@
 #include <log.h>
 #include <ACEX1K.h>		/* ACEX device family */
 #include <linux/delay.h>
+#include <time.h>
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
drivers/fpga/ivm_core.c +1 -0
index 3c9a01e5110..4ab5dab250a 100644
@@ -33,6 +33,7 @@
 #include <linux/string.h>
 #include <malloc.h>
 #include <lattice.h>
+#include <vsprintf.h>
 
 #define vme_out_char(c)	printf("%c", c)
 #define vme_out_hex(c)	printf("%x", c)
drivers/fpga/lattice.c +2 -2
index 3f481e38565..29cf2f60974 100644
@@ -350,8 +350,8 @@ int lattice_info(Lattice_desc *desc)
 			printf("Unsupported interface type, %d\n", desc->iface);
 		}
 
-		printf("Device Size:   \t%d bytes\n",
-				desc->size);
+		printf("Device Size:   \t%zu bytes\n",
+		       desc->size);
 
 		if (desc->iface_fns) {
 			printf("Device Function Table @ 0x%p\n",
drivers/fpga/spartan2.c +1 -0
index 906649ea181..792e4033428 100644
@@ -9,6 +9,7 @@
 #include <config.h>		/* core U-Boot definitions */
 #include <log.h>
 #include <spartan2.h>		/* Spartan-II device family */
+#include <time.h>
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
drivers/fpga/stratixII.c +60 -71

193 lines not on this page · raw message

drivers/fpga/stratixv.c +1 -1
index 372f16d92d1..4b251994598 100644
@@ -48,7 +48,7 @@ int stratixv_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 	int spi_dev;
 	int ret = 0;
 
-	if ((u32)rbf_data & 0x3) {
+	if ((size_t)rbf_data & 0x3) {
 		puts("FPGA: Unaligned data, realign to 32bit boundary.\n");
 		return -EINVAL;
 	}
drivers/fpga/versalpl.c +0 -1
index d691f135e89..624493ad838 100644
@@ -6,7 +6,6 @@
 
 #include <cpu_func.h>
 #include <log.h>
-#include <asm/arch/sys_proto.h>
 #include <memalign.h>
 #include <versalpl.h>
 #include <zynqmp_firmware.h>
drivers/fpga/virtex2.c +2 -0
index 8e2c12bb58b..805cbac8082 100644
@@ -19,6 +19,7 @@
 #include <log.h>
 #include <virtex2.h>
 #include <linux/delay.h>
+#include <time.h>
 
 /*
  * If the SelectMap interface can be overrun by the processor, enable
@@ -301,6 +302,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
 	size_t bytecount = 0;
 	unsigned char *data = (unsigned char *)buf;
 	int cookie = desc->cookie;
+	unsigned long ts;
 
 	ret_val = virtex2_slave_pre(fn, cookie);
 	if (ret_val != FPGA_SUCCESS)
include/stratixII.h +3 -3
index 3c06bb2955a..785cdf41cb8 100644
@@ -6,8 +6,8 @@
 #ifndef _STRATIXII_H_
 #define _STRATIXII_H_
 
-extern int StratixII_load (Altera_desc * desc, void *image, size_t size);
-extern int StratixII_dump (Altera_desc * desc, void *buf, size_t bsize);
-extern int StratixII_info (Altera_desc * desc);
+int StratixII_load(Altera_desc *desc, const void *buf, size_t size);
+int StratixII_dump(Altera_desc *desc, const void *buf, size_t bsize);
+int StratixII_info(Altera_desc *desc);
 
 #endif				/* _STRATIXII_H_ */
Signature · 1 line
2.48.1