Skip to contentSkip to conversation

Improve user feedback in case of FPGA bitstream load failure

PATCH Applied [email protected] 2 participants 8 messages Jul 8, 2025 – Jul 10, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v5 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 message more explicit because simply returning the command usage without indicating the root cause is not helpful.

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

v5:
* add new patch 5/6 to fix Wstrict-prototypes error, reported by clang
* revert sprintf format to original in patch 1/6 zynqpl.c
* remove Kconfig new dependency in patch 2/6, fixed upstream already

v4: https://lore.kernel.org/u-boot/[email protected]/
* make better use of prefixes in commit subjects
* change patches' order to ensure no commit introduces compiler warnings or errors i.e. defconfig is now patch 5/5
* add new patch 4/5 to remove compiler Werror=unused-function
* add an additional Kconfig dependency to patch 2/5

v3: https://lore.kernel.org/all/[email protected]/
* enable FPGA configs in sandbox_defconfig instead of new one

v2: https://lore.kernel.org/all/[email protected]/
* use log_* instead of puts() which is now preferred
* harmonize user feedback format; remove useless strings
* add a sandbox_fpga_defconfig; amend fpga Kconfig
* fix various compiler errors and warnings

v1: https://lore.kernel.org/all/[email protected]/

Pieter Van Trappen (6):
cmd: fpga: improve user feedback in case of bitstream load failure
drivers: fpga: add Kconfig dependency
drivers: fpga: correct compiler errors and warnings
drivers: fpga: cleanup printf usage
drivers: fpga: fix function declaration without a prototype
configs: enable FPGA commands and drivers at sandbox_defconfig

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

base-commit: 1323b480a6fc053475901a90bdaece2ddcc47310
prerequisite-patch-id: d13ffa9f16b79939ca26d5334d15c077c11427af
prerequisite-patch-id: cf4d9931473e7f673dad6a4e7c23fc3fe4678408
prerequisite-patch-id: e6885654262d1a9ddbb8d33e988be9c7c04a95cf

Signature · 1 line
2.48.1
#1 lore raw

PATCH v5 1/6 cmd: fpga: improve user feedback in case of 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..5a37a33b0a7 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 (%x)\n",
+			(u32)buf);
 		return FPGA_FAIL;
 	}
 
Signature · 1 line
2.48.1
#2 lore raw

PATCH v5 2/6 drivers: fpga: add Kconfig dependency

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
#3 lore raw

PATCH v5 3/6 drivers: fpga: correct compiler errors and warnings

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

Errors reported by GCC 14.2 when enabling 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 | 132 ++++++++++++++++++---------------------
 drivers/fpga/stratixv.c  |   2 +-
 drivers/fpga/versalpl.c  |   1 -
 drivers/fpga/virtex2.c   |   2 +
 include/stratixII.h      |   6 +-
 10 files changed, 73 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 +61 -71

196 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
#4 lore raw

PATCH v5 4/6 drivers: fpga: cleanup printf usage

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

Remove fpga_no_sup to get rid of Werror=unused-function when all FPGA configurations are enabled.

Swap all printf calls to log_* as this is now preferred and includes the calling __func__.

---
 drivers/fpga/fpga.c   | 103 +++++++++++++++++-------------------------
 drivers/fpga/xilinx.c |   2 +-
 include/fpga.h        |   2 +-
 3 files changed, 44 insertions(+), 63 deletions(-)
drivers/fpga/fpga.c +42 -61
index f88267e01b6..2297fefd149 100644
@@ -16,20 +16,6 @@
 static int next_desc = FPGA_INVALID_DEVICE;
 static fpga_desc desc_table[CONFIG_MAX_FPGA_DEVICES];
 
-/*
- * fpga_no_sup
- * 'no support' message function
- */
-static void fpga_no_sup(char *fn, char *msg)
-{
-	if (fn && msg)
-		printf("%s: No support for %s.\n", fn, msg);
-	else if (msg)
-		printf("No support for %s.\n", msg);
-	else
-		printf("No FPGA support!\n");
-}
-
 /* fpga_get_desc
  *	map a device number to a descriptor
  */
@@ -39,8 +25,8 @@ const fpga_desc *fpga_get_desc(int devnum)
 
 	if ((devnum >= 0) && (devnum < next_desc)) {
 		desc = &desc_table[devnum];
-		debug("%s: found fpga descriptor #%d @ 0x%p\n",
-		      __func__, devnum, desc);
+		log_debug("found fpga descriptor #%d @ 0x%p\n",
+			  devnum, desc);
 	}
 
 	return desc;
@@ -51,15 +37,15 @@ const fpga_desc *fpga_get_desc(int devnum)
  *	generic parameter checking code
  */
 const fpga_desc *fpga_validate(int devnum, const void *buf,
-			       size_t bsize, char *fn)
+			       size_t bsize)
 {
 	const fpga_desc *desc = fpga_get_desc(devnum);
 
 	if (!desc)
-		printf("%s: Invalid device number %d\n", fn, devnum);
+		log_err("Invalid device number %d\n", devnum);
 
 	if (!buf) {
-		printf("%s: Null buffer.\n", fn);
+		log_err("Null buffer.\n");
 		return NULL;
 	}
 	return desc;
@@ -75,40 +61,40 @@ static int fpga_dev_info(int devnum)
 	const fpga_desc *desc = fpga_get_desc(devnum);
 
 	if (desc) {
-		debug("%s: Device Descriptor @ 0x%p\n",
-		      __func__, desc->devdesc);
+		log_info("Device Descriptor @ 0x%p\n",
+			 desc->devdesc);
 
 		switch (desc->devtype) {
 		case fpga_xilinx:
 #if defined(CONFIG_FPGA_XILINX)
-			printf("Xilinx Device\nDescriptor @ 0x%p\n", desc);
+			log_info("Xilinx Device\nDescriptor @ 0x%p\n", desc);
 			ret_val = xilinx_info(desc->devdesc);
 #else
-			fpga_no_sup((char *)__func__, "Xilinx devices");
+			log_err("No support for Xilinx devices.\n");
 #endif
 			break;
 		case fpga_altera:
 #if defined(CONFIG_FPGA_ALTERA)
-			printf("Altera Device\nDescriptor @ 0x%p\n", desc);
+			log_info("Altera Device\nDescriptor @ 0x%p\n", desc);
 			ret_val = altera_info(desc->devdesc);
 #else
-			fpga_no_sup((char *)__func__, "Altera devices");
+			log_err("No support for Altera devices.\n");
 #endif
 			break;
 		case fpga_lattice:
 #if defined(CONFIG_FPGA_LATTICE)
-			printf("Lattice Device\nDescriptor @ 0x%p\n", desc);
+			log_info("Lattice Device\nDescriptor @ 0x%p\n", desc);
 			ret_val = lattice_info(desc->devdesc);
 #else
-			fpga_no_sup((char *)__func__, "Lattice devices");
+			log_err("No support for Lattice devices.\n");
 #endif
 			break;
 		default:
-			printf("%s: Invalid or unsupported device type %d\n",
-			       __func__, desc->devtype);
+			log_err("Invalid or unsupported device type %d\n",
+				desc->devtype);
 		}
 	} else {
-		printf("%s: Invalid device number %d\n", __func__, devnum);
+		log_err("Invalid device number %d\n", devnum);
 	}
 
 	return ret_val;
@@ -144,23 +130,22 @@ int fpga_add(fpga_type devtype, void *desc)
 	int devnum = FPGA_INVALID_DEVICE;
 
 	if (!desc) {
-		printf("%s: NULL device descriptor\n", __func__);
+		log_err("NULL device descriptor\n");
 		return devnum;
 	}
 
 	if (next_desc < 0) {
-		printf("%s: FPGA support not initialized!\n", __func__);
+		log_err("FPGA support not initialized!\n");
 	} else if ((devtype > fpga_min_type) && (devtype < fpga_undefined)) {
 		if (next_desc < CONFIG_MAX_FPGA_DEVICES) {
 			devnum = next_desc;
 			desc_table[next_desc].devtype = devtype;
 			desc_table[next_desc++].devdesc = desc;
 		} else {
-			printf("%s: Exceeded Max FPGA device count\n",
-			       __func__);
+			log_err("Exceeded Max FPGA device count\n");
 		}
 	} else {
-		printf("%s: Unsupported FPGA type %d\n", __func__, devtype);
+		log_err("Unsupported FPGA type %d\n", devtype);
 	}
 
 	return devnum;
@@ -181,7 +166,7 @@ int __weak fpga_is_partial_data(int devnum, size_t img_len)
 int __weak fpga_loadbitstream(int devnum, char *fpgadata, size_t size,
 			      bitstream_type bstype)
 {
-	printf("Bitstream support not implemented for this FPGA device\n");
+	log_err("Bitstream support not implemented for this FPGA device\n");
 	return FPGA_FAIL;
 }
 
@@ -190,8 +175,7 @@ int fpga_fsload(int devnum, const void *buf, size_t size,
 		 fpga_fs_info *fpga_fsinfo)
 {
 	int ret_val = FPGA_FAIL;           /* assume failure */
-	const fpga_desc *desc = fpga_validate(devnum, buf, size,
-					      (char *)__func__);
+	const fpga_desc *desc = fpga_validate(devnum, buf, size);
 
 	if (desc) {
 		switch (desc->devtype) {
@@ -200,12 +184,12 @@ int fpga_fsload(int devnum, const void *buf, size_t size,
 			ret_val = xilinx_loadfs(desc->devdesc, buf, size,
 						fpga_fsinfo);
 #else
-			fpga_no_sup((char *)__func__, "Xilinx devices");
+			log_err("No support for Xilinx devices.\n");
 #endif
 			break;
 		default:
-			printf("%s: Invalid or unsupported device type %d\n",
-			       __func__, desc->devtype);
+			log_err("Invalid or unsupported device type %d\n",
+				desc->devtype);
 		}
 	}
 
@@ -219,8 +203,7 @@ int fpga_loads(int devnum, const void *buf, size_t size,
 {
 	int ret_val = FPGA_FAIL;
 
-	const fpga_desc *desc = fpga_validate(devnum, buf, size,
-					      (char *)__func__);
+	const fpga_desc *desc = fpga_validate(devnum, buf, size);
 
 	if (desc) {
 		switch (desc->devtype) {
@@ -229,12 +212,12 @@ int fpga_loads(int devnum, const void *buf, size_t size,
 			ret_val = xilinx_loads(desc->devdesc, buf, size,
 					       fpga_sec_info);
 #else
-			fpga_no_sup((char *)__func__, "Xilinx devices");
+			log_err("No support for Xilinx devices.\n");
 #endif
 			break;
 		default:
-			printf("%s: Invalid or unsupported device type %d\n",
-			       __func__, desc->devtype);
+			log_err("Invalid or unsupported device type %d\n",
+				desc->devtype);
 		}
 	}
 
@@ -265,8 +248,7 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype,
 {
 	int ret_val = FPGA_FAIL;           /* assume failure */
 	int ret_notify;
-	const fpga_desc *desc = fpga_validate(devnum, buf, bsize,
-					      (char *)__func__);
+	const fpga_desc *desc = fpga_validate(devnum, buf, bsize);
 
 	if (desc) {
 		switch (desc->devtype) {
@@ -275,26 +257,26 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype,
 			ret_val = xilinx_load(desc->devdesc, buf, bsize,
 					      bstype, flags);
 #else
-			fpga_no_sup((char *)__func__, "Xilinx devices");
+			log_err("No support for Xilinx devices.\n");
 #endif
 			break;
 		case fpga_altera:
 #if defined(CONFIG_FPGA_ALTERA)
 			ret_val = altera_load(desc->devdesc, buf, bsize);
 #else
-			fpga_no_sup((char *)__func__, "Altera devices");
+			log_err("No support for Altera devices.\n");
 #endif
 			break;
 		case fpga_lattice:
 #if defined(CONFIG_FPGA_LATTICE)
 			ret_val = lattice_load(desc->devdesc, buf, bsize);
 #else
-			fpga_no_sup((char *)__func__, "Lattice devices");
+			log_err("No support for Lattice devices.\n");
 #endif
 			break;
 		default:
-			printf("%s: Invalid or unsupported device type %d\n",
-			       __func__, desc->devtype);
+			log_err("Invalid or unsupported device type %d\n",
+				desc->devtype);
 		}
 	}
 
@@ -312,8 +294,7 @@ int fpga_load(int devnum, const void *buf, size_t bsize, bitstream_type bstype,
 int fpga_dump(int devnum, const void *buf, size_t bsize)
 {
 	int ret_val = FPGA_FAIL;           /* assume failure */
-	const fpga_desc *desc = fpga_validate(devnum, buf, bsize,
-					      (char *)__func__);
+	const fpga_desc *desc = fpga_validate(devnum, buf, bsize);
 
 	if (desc) {
 		switch (desc->devtype) {
@@ -321,26 +302,26 @@ int fpga_dump(int devnum, const void *buf, size_t bsize)
 #if defined(CONFIG_FPGA_XILINX)
 			ret_val = xilinx_dump(desc->devdesc, buf, bsize);
 #else
-			fpga_no_sup((char *)__func__, "Xilinx devices");
+			log_err("No support for Xilinx devices.\n");
 #endif
 			break;
 		case fpga_altera:
 #if defined(CONFIG_FPGA_ALTERA)
 			ret_val = altera_dump(desc->devdesc, buf, bsize);
 #else
-			fpga_no_sup((char *)__func__, "Altera devices");
+			log_err("No support for Altera devices.\n");
 #endif
 			break;
 		case fpga_lattice:
 #if defined(CONFIG_FPGA_LATTICE)
 			ret_val = lattice_dump(desc->devdesc, buf, bsize);
 #else
-			fpga_no_sup((char *)__func__, "Lattice devices");
+			log_err("No support for Lattice devices.\n");
 #endif
 			break;
 		default:
-			printf("%s: Invalid or unsupported device type %d\n",
-			       __func__, desc->devtype);
+			log_err("Invalid or unsupported device type %d\n",
+				desc->devtype);
 		}
 	}
 
@@ -363,7 +344,7 @@ int fpga_info(int devnum)
 
 			return FPGA_SUCCESS;
 		} else {
-			printf("%s: No FPGA devices available.\n", __func__);
+			log_err("No FPGA devices available.\n");
 			return FPGA_FAIL;
 		}
 	}
drivers/fpga/xilinx.c +1 -1
index c46513226d9..28c68faba55 100644
@@ -49,7 +49,7 @@ int fpga_loadbitstream(int devnum, char *fpgadata, size_t size,
 
 	dataptr = (unsigned char *)fpgadata;
 	/* Find out fpga_description */
-	desc = fpga_validate(devnum, dataptr, 0, (char *)__func__);
+	desc = fpga_validate(devnum, dataptr, 0);
 	/* Assign xilinx device description */
 	xdesc = desc->devdesc;
 
include/fpga.h +1 -1
index 4cc44164b2f..a144238e66a 100644
@@ -79,7 +79,7 @@ int fpga_loadbitstream(int devnum, char *fpgadata, size_t size,
 int fpga_dump(int devnum, const void *buf, size_t bsize);
 int fpga_info(int devnum);
 const fpga_desc *fpga_validate(int devnum, const void *buf,
-			       size_t bsize, char *fn);
+			       size_t bsize);
 int fpga_compatible2flag(int devnum, const char *compatible);
 
 #endif	/* _FPGA_H_ */
Signature · 1 line
2.48.1
#5 lore raw

PATCH v5 5/6 drivers: fpga: fix function declaration without a prototype

In reply to [email protected]

From: Pieter Van Trappen <[email protected]>

As reported by clang 20.1, fix multiple of the following:
drivers/fpga/ivm_core.c:593:23: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]

  593 | long int ispVMDataSize()
      |                       ^
      |                        void

Also fix the following warning from checkpatch.pl:
WARNING: Prefer 'long' over 'long int' as the int is unnecessary

---
 drivers/fpga/ivm_core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/fpga/ivm_core.c +6 -6
index 4ab5dab250a..37d5c5ec9ec 100644
@@ -292,7 +292,7 @@ unsigned short g_usLVDSPairCount;
  */
 
 static signed char ispVMDataCode(void);
-static long int ispVMDataSize(void);
+static long ispVMDataSize(void);
 static void ispVMData(unsigned char *Data);
 static signed char ispVMShift(signed char Code);
 static signed char ispVMAmble(signed char Code);
@@ -590,7 +590,7 @@ void ispVMFreeMem(void)
  *
  */
 
-long int ispVMDataSize()
+long ispVMDataSize(void)
 {
 	/* 09/11/07 NN added local variables initialization */
 	long int iSize           = 0;
@@ -615,7 +615,7 @@ long int ispVMDataSize()
  *
  */
 
-signed char ispVMCode()
+signed char ispVMCode(void)
 {
 	/* 09/11/07 NN added local variables initialization */
 	unsigned short iRepeatSize = 0;
@@ -1114,7 +1114,7 @@ signed char ispVMCode()
  *
  */
 
-signed char ispVMDataCode()
+signed char ispVMDataCode(void)
 {
 	/* 09/11/07 NN added local variables initialization */
 	signed char cDataByte    = 0;
@@ -2476,7 +2476,7 @@ void ispVMStateMachine(signed char cNextJTAGState)
  *
  */
 
-void ispVMStart()
+void ispVMStart(void)
 {
 #ifdef DEBUG
 	printf("// ISPVM EMBEDDED ADDED\n");
@@ -2505,7 +2505,7 @@ void ispVMStart()
  *
  */
 
-void ispVMEnd()
+void ispVMEnd(void)
 {
 #ifdef DEBUG
 	printf("// ISPVM EMBEDDED ADDED\n");
Signature · 1 line
2.48.1
#6 lore raw

PATCH v5 6/6 configs: 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
maintainer Applied
#7 lore raw
In reply to [email protected]
Quoted 62 lines · On 7/8/25 17:24, [email protected] wrote:

From: Pieter Van Trappen <[email protected]>

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

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

v5:
* add new patch 5/6 to fix Wstrict-prototypes error, reported by clang
* revert sprintf format to original in patch 1/6 zynqpl.c
* remove Kconfig new dependency in patch 2/6, fixed upstream already

v4: https://lore.kernel.org/u-boot/[email protected]/
* make better use of prefixes in commit subjects
* change patches' order to ensure no commit introduces compiler warnings or errors i.e. defconfig is now patch 5/5
* add new patch 4/5 to remove compiler Werror=unused-function
* add an additional Kconfig dependency to patch 2/5

v3: https://lore.kernel.org/all/[email protected]/
* enable FPGA configs in sandbox_defconfig instead of new one

v2: https://lore.kernel.org/all/[email protected]/
* use log_* instead of puts() which is now preferred
* harmonize user feedback format; remove useless strings
* add a sandbox_fpga_defconfig; amend fpga Kconfig
* fix various compiler errors and warnings

v1: https://lore.kernel.org/all/[email protected]/

Pieter Van Trappen (6):
cmd: fpga: improve user feedback in case of bitstream load failure
drivers: fpga: add Kconfig dependency
drivers: fpga: correct compiler errors and warnings
drivers: fpga: cleanup printf usage
drivers: fpga: fix function declaration without a prototype
configs: enable FPGA commands and drivers at sandbox_defconfig

  cmd/fpga.c                | 101 ++++++++++++++---------------
  configs/sandbox_defconfig |  20 ++++++
  drivers/fpga/ACEX1K.c     |   1 +
  drivers/fpga/Kconfig      |   1 +
  drivers/fpga/fpga.c       | 103 ++++++++++++-----------------
  drivers/fpga/ivm_core.c   |  13 ++--
  drivers/fpga/lattice.c    |   4 +-
  drivers/fpga/spartan2.c   |   1 +
  drivers/fpga/stratixII.c  | 132 ++++++++++++++++++--------------------
  drivers/fpga/stratixv.c   |   2 +-
  drivers/fpga/versalpl.c   |   1 -
  drivers/fpga/virtex2.c    |   2 +
  drivers/fpga/xilinx.c     |   2 +-
  drivers/fpga/zynqmppl.c   |   4 +-
  drivers/fpga/zynqpl.c     |   4 +-
  include/fpga.h            |   2 +-
  include/stratixII.h       |   6 +-
  17 files changed, 198 insertions(+), 201 deletions(-)
Quoted 4 lines

base-commit: 1323b480a6fc053475901a90bdaece2ddcc47310
prerequisite-patch-id: d13ffa9f16b79939ca26d5334d15c077c11427af
prerequisite-patch-id: cf4d9931473e7f673dad6a4e7c23fc3fe4678408
prerequisite-patch-id: e6885654262d1a9ddbb8d33e988be9c7c04a95cf

Applied.
M