drivers: fpga: correct compiler errors and warnings

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.

Signed-off-by: Pieter Van Trappen <pieter.van.trappen@cern.ch>
Link: https://lore.kernel.org/r/20250708152455.1214487-4-vtpieter@gmail.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/cmd/fpga.c b/cmd/fpga.c
index 9cc51f0..d51c380 100644 (file)
--- a/cmd/fpga.c
+++ b/cmd/fpga.c
@@ -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;

diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 3de9011..e1514fc 100644 (file)
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -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).

diff --git a/drivers/fpga/ivm_core.c b/drivers/fpga/ivm_core.c
index 3c9a01e..4ab5dab 100644 (file)
--- a/drivers/fpga/ivm_core.c
+++ b/drivers/fpga/ivm_core.c
@@ -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)

diff --git a/drivers/fpga/lattice.c b/drivers/fpga/lattice.c
index 3f481e3..29cf2f6 100644 (file)
--- a/drivers/fpga/lattice.c
+++ b/drivers/fpga/lattice.c
@@ -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",

diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 906649e..792e403 100644 (file)
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -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).

diff --git a/drivers/fpga/stratixII.c b/drivers/fpga/stratixII.c
index 73fecd9..3f98438 100644 (file)
--- a/drivers/fpga/stratixII.c
+++ b/drivers/fpga/stratixII.c
@@ -5,92 +5,41 @@
  */
 
 #include <altera.h>
+#include <stratixII.h>
 #include <linux/delay.h>
 
-int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
-                          int isSerial, int isSecure);
-int StratixII_ps_fpp_dump (Altera_desc * desc, void *buf, size_t bsize);
-
 /****************************************************************/
 /* Stratix II Generic Implementation                            */
-int StratixII_load (Altera_desc * desc, void *buf, size_t bsize)
-{
-       int ret_val = FPGA_FAIL;
-
-       switch (desc->iface) {
-       case passive_serial:
-               ret_val = StratixII_ps_fpp_load (desc, buf, bsize, 1, 0);
-               break;
-       case fast_passive_parallel:
-               ret_val = StratixII_ps_fpp_load (desc, buf, bsize, 0, 0);
-               break;
-       case fast_passive_parallel_security:
-               ret_val = StratixII_ps_fpp_load (desc, buf, bsize, 0, 1);
-               break;
-
-               /* Add new interface types here */
-       default:
-               printf ("%s: Unsupported interface type, %d\n", __FUNCTION__,
-                       desc->iface);
-       }
-       return ret_val;
-}
-
-int StratixII_dump (Altera_desc * desc, void *buf, size_t bsize)
-{
-       int ret_val = FPGA_FAIL;
-
-       switch (desc->iface) {
-       case passive_serial:
-       case fast_passive_parallel:
-       case fast_passive_parallel_security:
-               ret_val = StratixII_ps_fpp_dump (desc, buf, bsize);
-               break;
-               /* Add new interface types here */
-       default:
-               printf ("%s: Unsupported interface type, %d\n", __FUNCTION__,
-                       desc->iface);
-       }
-       return ret_val;
-}
-
-int StratixII_info (Altera_desc * desc)
-{
-       return FPGA_SUCCESS;
-}
-
-int StratixII_ps_fpp_dump (Altera_desc * desc, void *buf, size_t bsize)
+int StratixII_ps_fpp_dump(Altera_desc *desc, const void *buf, size_t bsize)
 {
-       printf ("Stratix II Fast Passive Parallel dump is not implemented\n");
+       printf("Stratix II Fast Passive Parallel dump is not implemented\n");
        return FPGA_FAIL;
 }
 
-int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
-                          int isSerial, int isSecure)
+int StratixII_ps_fpp_load(Altera_desc *desc, const void *buf, size_t bsize,
+                         int isSerial, int isSecure)
 {
        altera_board_specific_func *fns;
        int cookie;
        int ret_val = FPGA_FAIL;
        int bytecount;
-       char *buff = buf;
+       const char *buff = buf;
        int i;
 
        if (!desc) {
-               printf ("%s(%d) Altera_desc missing\n", __FUNCTION__, __LINE__);
+               log_err("Altera_desc missing\n");
                return FPGA_FAIL;
        }
        if (!buff) {
-               printf ("%s(%d) buffer is missing\n", __FUNCTION__, __LINE__);
+               log_err("buffer is missing\n");
                return FPGA_FAIL;
        }
        if (!bsize) {
-               printf ("%s(%d) size is zero\n", __FUNCTION__, __LINE__);
+               log_err("size is zero\n");
                return FPGA_FAIL;
        }
        if (!desc->iface_fns) {
-               printf
-                   ("%s(%d) Altera_desc function interface table is missing\n",
-                    __FUNCTION__, __LINE__);
+               log_err("Altera_desc function interface table is missing\n");
                return FPGA_FAIL;
        }
        fns = (altera_board_specific_func *) (desc->iface_fns);
@@ -99,9 +48,7 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
        if (!
            (fns->config && fns->status && fns->done && fns->data
             && fns->abort)) {
-               printf
-                   ("%s(%d) Missing some function in the function interface table\n",
-                    __FUNCTION__, __LINE__);
+               log_err("Missing some function in the function interface table\n");
                return FPGA_FAIL;
        }
 
@@ -124,13 +71,12 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
        bytecount = 0;
        fns->clk (0, 1, cookie);
 
-       printf ("loading to fpga    ");
+       printf("loading to fpga    ");
        while (bytecount < bsize) {
                /* 3.1 check stratix has not signaled us an error */
                if (fns->status (cookie) != 1) {
-                       printf
-                           ("\n%s(%d) Stratix failed (byte transferred till failure 0x%x)\n",
-                            __FUNCTION__, __LINE__, bytecount);
+                       log_err("\nStratix failed (byte transferred till failure 0x%x)\n",
+                               bytecount);
                        fns->abort (cookie);
                        return FPGA_FAIL;
                }
@@ -162,7 +108,7 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 
                /* 3.5 while clk is deasserted it is safe to print some progress indication */
                if ((bytecount % (bsize / 100)) == 0) {
-                       printf ("\b\b\b%02d\%", bytecount * 100 / bsize);
+                       printf("\b\b\b%02zu\%%", bytecount * 100 / bsize);
                }
        }
 
@@ -170,11 +116,11 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
        fns->clk (1, 1, cookie);
        udelay(100);
        if (!fns->done (cookie)) {
-               printf (" error!.\n");
+               printf(" error!.\n");
                fns->abort (cookie);
                return FPGA_FAIL;
        } else {
-               printf ("\b\b\b done.\n");
+               printf("\b\b\b done.\n");
        }
 
        /* 5. call lower layer post configuration */
@@ -187,3 +133,47 @@ int StratixII_ps_fpp_load (Altera_desc * desc, void *buf, size_t bsize,
 
        return FPGA_SUCCESS;
 }
+
+int StratixII_load(Altera_desc *desc, const void *buf, size_t size)
+{
+       int ret_val = FPGA_FAIL;
+
+       switch (desc->iface) {
+       case passive_serial:
+               ret_val = StratixII_ps_fpp_load(desc, buf, size, 1, 0);
+               break;
+       case fast_passive_parallel:
+               ret_val = StratixII_ps_fpp_load(desc, buf, size, 0, 0);
+               break;
+       case fast_passive_parallel_security:
+               ret_val = StratixII_ps_fpp_load(desc, buf, size, 0, 1);
+               break;
+
+               /* Add new interface types here */
+       default:
+               log_err("Unsupported interface type, %d\n", desc->iface);
+       }
+       return ret_val;
+}
+
+int StratixII_dump(Altera_desc *desc, const void *buf, size_t bsize)
+{
+       int ret_val = FPGA_FAIL;
+
+       switch (desc->iface) {
+       case passive_serial:
+       case fast_passive_parallel:
+       case fast_passive_parallel_security:
+               ret_val = StratixII_ps_fpp_dump(desc, buf, bsize);
+               break;
+               /* Add new interface types here */
+       default:
+               log_err("Unsupported interface type, %d\n", desc->iface);
+       }
+       return ret_val;
+}
+
+int StratixII_info(Altera_desc *desc)
+{
+       return FPGA_SUCCESS;
+}

diff --git a/drivers/fpga/stratixv.c b/drivers/fpga/stratixv.c
index 372f16d..4b25199 100644 (file)
--- a/drivers/fpga/stratixv.c
+++ b/drivers/fpga/stratixv.c
@@ -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;
        }

diff --git a/drivers/fpga/versalpl.c b/drivers/fpga/versalpl.c
index d691f13..624493a 100644 (file)
--- a/drivers/fpga/versalpl.c
+++ b/drivers/fpga/versalpl.c
@@ -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>

diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index 8e2c12b..805cbac 100644 (file)
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -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)

diff --git a/include/stratixII.h b/include/stratixII.h
index 3c06bb2..785cdf4 100644 (file)
--- a/include/stratixII.h
+++ b/include/stratixII.h
@@ -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_ */