Skip to contentSkip to conversation

Use logging feature instead of FPGA_DEBUG

PATCH Superseded Alexander Dahl 2 participants 9 messages Sep 19, 2022 – Sep 21, 2022 FPGA manager framework

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

cover Use logging feature instead of FPGA_DEBUG

Hei hei,

while working on FPGA support for a new device I discovered logging in some FPGA drivers is still done as in the old days. Bring that to what I thougt would be the currently preferred approach?

Notes: Adding those Kconfig symbols in patch 3 is just to be able to build those two drivers.

All drivers touched were build tested with the
gcc-11.1.0-nolibc/m68k-linux toolchain.

Lines with other possibly questionable output were not touched, only what seemed to be designated debug output.

Greets
Alex

Alexander Dahl (7):
fpga: altera: Use logging feature instead of FPGA_DEBUG
fpga: cyclon2: Use logging feature instead of FPGA_DEBUG
fpga: Add missing Kconfig symbols for old FPGA drivers
fpga: ACEX1K: Use logging feature instead of FPGA_DEBUG
fpga: spartan2: Use logging feature instead of FPGA_DEBUG
fpga: spartan3: Use logging feature instead of FPGA_DEBUG
fpga: virtex2: Use logging feature instead of FPGA_DEBUG

 drivers/fpga/ACEX1K.c   | 22 +++++++++-------------
 drivers/fpga/Kconfig    | 12 ++++++++++++
 drivers/fpga/altera.c   | 13 ++++++-------
 drivers/fpga/cyclon2.c  | 24 ++++++++++--------------
 drivers/fpga/spartan2.c | 34 +++++++++++++++-------------------
 drivers/fpga/spartan3.c | 34 +++++++++++++++-------------------
 drivers/fpga/virtex2.c  | 37 +++++++++++++++----------------------
 7 files changed, 82 insertions(+), 94 deletions(-)

base-commit: 0b3fe2b9777eff12ffd6735fc00291616b407622

Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/7 fpga: altera: Use logging feature instead of FPGA_DEBUG

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/altera.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/fpga/altera.c +6 -7
index 10c0475d25..5a8fee10a5 100644
@@ -7,6 +7,8 @@
  * Rich Ireland, Enterasys Networks, [email protected].
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 /*
  *  Altera FPGA support
  */
@@ -16,9 +18,6 @@
 #include <log.h>
 #include <stratixII.h>
 
-/* Define FPGA_DEBUG to 1 to get debug printf's */
-#define FPGA_DEBUG	0
-
 static const struct altera_fpga {
 	enum altera_family	family;
 	const char		*name;
@@ -106,8 +105,8 @@ int altera_load(Altera_desc *desc, const void *buf, size_t bsize)
 	if (!fpga)
 		return FPGA_FAIL;
 
-	debug_cond(FPGA_DEBUG, "%s: Launching the %s Loader...\n",
-		   __func__, fpga->name);
+	log_debug("%s: Launching the %s Loader...\n",
+		  __func__, fpga->name);
 	if (fpga->load)
 		return fpga->load(desc, buf, bsize);
 	return 0;
@@ -120,8 +119,8 @@ int altera_dump(Altera_desc *desc, const void *buf, size_t bsize)
 	if (!fpga)
 		return FPGA_FAIL;
 
-	debug_cond(FPGA_DEBUG, "%s: Launching the %s Reader...\n",
-		   __func__, fpga->name);
+	log_debug("%s: Launching the %s Reader...\n",
+		  __func__, fpga->name);
 	if (fpga->dump)
 		return fpga->dump(desc, buf, bsize);
 	return 0;
Signature · 1 line
2.30.2
#2 lore raw

Re: [PATCH 1/7] fpga: altera: Use logging feature instead of FPGA_DEBUG

Quoted 13 lines · Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
  drivers/fpga/altera.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
drivers/fpga/altera.c +0 -0
index 10c0475d25..5a8fee10a5 100644

drivers/fpga/altera.c line 10

Quoted 4 lines
drivers/fpga/altera.c +1 -0
@@ -7,6 +7,8 @@
   * Rich Ireland, Enterasys Networks, [email protected].
   */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER

I think all changes in this series are fine expect this LOG_CATEGORY. This is generic FS loader. I think fgpa uclass should be created.

Thanks,
Michal

#3 lore raw

PATCH 2/7 fpga: cyclon2: Use logging feature instead of FPGA_DEBUG

In reply to Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/cyclon2.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/fpga/cyclon2.c +10 -14
index 3b008facb8..002fa2ca5d 100644
@@ -5,18 +5,14 @@
  * Based on ACE1XK.c
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 #include <common.h>		/* core U-Boot definitions */
+#include <log.h>
 #include <altera.h>
 #include <ACEX1K.h>		/* ACEX device family */
 #include <linux/delay.h>
 
-/* Define FPGA_DEBUG to get debug printf's */
-#ifdef	FPGA_DEBUG
-#define PRINTF(fmt, args...)	printf(fmt, ##args)
-#else
-#define PRINTF(fmt, args...)
-#endif
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
@@ -42,7 +38,7 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case passive_serial:
-		PRINTF("%s: Launching Passive Serial Loader\n", __func__);
+		log_debug("%s: Launching Passive Serial Loader\n", __func__);
 		ret_val = CYC2_ps_load(desc, buf, bsize);
 		break;
 
@@ -51,8 +47,8 @@ int CYC2_load(Altera_desc *desc, const void *buf, size_t bsize)
 		 * done in the write() callback. Use the existing PS load
 		 * function for FPP, too.
 		 */
-		PRINTF("%s: Launching Fast Passive Parallel Loader\n",
-		       __func__);
+		log_debug("%s: Launching Fast Passive Parallel Loader\n",
+			  __func__);
 		ret_val = CYC2_ps_load(desc, buf, bsize);
 		break;
 
@@ -72,7 +68,7 @@ int CYC2_dump(Altera_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case passive_serial:
-		PRINTF("%s: Launching Passive Serial Dump\n", __func__);
+		log_debug("%s: Launching Passive Serial Dump\n", __func__);
 		ret_val = CYC2_ps_dump(desc, buf, bsize);
 		break;
 
@@ -99,14 +95,14 @@ static int CYC2_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 	Altera_CYC2_Passive_Serial_fns *fn = desc->iface_fns;
 	int	ret = 0;
 
-	PRINTF("%s: start with interface functions @ 0x%p\n",
-	       __func__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"config:\t0x%p\n"
Signature · 1 line
2.30.2
#4 lore raw

PATCH 3/7 fpga: Add missing Kconfig symbols for old FPGA drivers

In reply to Alexander Dahl

Those drivers could not be built anymore without those options present.

---
 drivers/fpga/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
drivers/fpga/Kconfig +12 -0
index e07a9cf80e..4d55f60ba9 100644
@@ -27,6 +27,12 @@ config FPGA_STRATIX_V
 	help
 	  Say Y here to enable the Altera Stratix V FPGA specific driver.
 
+config FPGA_ACEX1K
+	bool "Enable Altera ACEX 1K driver"
+	depends on FPGA_ALTERA
+	help
+	  Say Y here to enable the Altera ACEX 1K FPGA specific driver.
+
 config FPGA_CYCLON2
 	bool "Enable Altera FPGA driver for Cyclone II"
 	depends on FPGA_ALTERA
@@ -71,6 +77,12 @@ config FPGA_VERSALPL
 	  Versal. The bitstream will only be generated as PDI for Versal
 	  platform.
 
+config FPGA_SPARTAN2
+	bool "Enable Spartan2 FPGA driver"
+	depends on FPGA_XILINX
+	help
+	  Enable Spartan2 FPGA driver.
+
 config FPGA_SPARTAN3
 	bool "Enable Spartan3 FPGA driver"
 	depends on FPGA_XILINX
Signature · 1 line
2.30.2
#5 lore raw

PATCH 4/7 fpga: ACEX1K: Use logging feature instead of FPGA_DEBUG

In reply to Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/ACEX1K.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/fpga/ACEX1K.c +9 -13
index aca8049c56..d6bfc26229 100644
@@ -7,18 +7,14 @@
  * Rich Ireland, Enterasys Networks, [email protected].
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 #include <common.h>		/* core U-Boot definitions */
 #include <console.h>
+#include <log.h>
 #include <ACEX1K.h>		/* ACEX device family */
 #include <linux/delay.h>
 
-/* Define FPGA_DEBUG to get debug printf's */
-#ifdef	FPGA_DEBUG
-#define PRINTF(fmt,args...)	printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in
@@ -44,7 +40,7 @@ int ACEX1K_load(Altera_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case passive_serial:
-		PRINTF ("%s: Launching Passive Serial Loader\n", __FUNCTION__);
+		log_debug("%s: Launching Passive Serial Loader\n", __func__);
 		ret_val = ACEX1K_ps_load (desc, buf, bsize);
 		break;
 
@@ -64,7 +60,7 @@ int ACEX1K_dump(Altera_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case passive_serial:
-		PRINTF ("%s: Launching Passive Serial Dump\n", __FUNCTION__);
+		log_debug("%s: Launching Passive Serial Dump\n", __func__);
 		ret_val = ACEX1K_ps_dump (desc, buf, bsize);
 		break;
 
@@ -93,8 +89,8 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 	Altera_ACEX1K_Passive_Serial_fns *fn = desc->iface_fns;
 	int i;
 
-	PRINTF ("%s: start with interface functions @ 0x%p\n",
-			__FUNCTION__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		size_t bytecount = 0;
@@ -102,7 +98,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF ("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"config:\t0x%p\n"
@@ -110,7 +106,7 @@ static int ACEX1K_ps_load(Altera_desc *desc, const void *buf, size_t bsize)
 				"clk:\t0x%p\n"
 				"data:\t0x%p\n"
 				"done:\t0x%p\n\n",
-				__FUNCTION__, &fn, fn, fn->config, fn->status,
+				__func__, &fn, fn, fn->config, fn->status,
 				fn->clk, fn->data, fn->done);
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		printf ("Loading FPGA Device %d...", cookie);
Signature · 1 line
2.30.2
#6 lore raw

PATCH 5/7 fpga: spartan2: Use logging feature instead of FPGA_DEBUG

In reply to Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/spartan2.c | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/fpga/spartan2.c +15 -19
index 47692e3207..231a2e9e20 100644
@@ -4,16 +4,12 @@
  * Rich Ireland, Enterasys Networks, [email protected].
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 #include <common.h>		/* core U-Boot definitions */
+#include <log.h>
 #include <spartan2.h>		/* Spartan-II device family */
 
-/* Define FPGA_DEBUG to get debug printf's */
-#ifdef	FPGA_DEBUG
-#define PRINTF(fmt,args...)	printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
 #undef CONFIG_SYS_FPGA_CHECK_BUSY
 
 /* Note: The assumption is that we cannot possibly run fast enough to
@@ -46,12 +42,12 @@ static int spartan2_load(xilinx_desc *desc, const void *buf, size_t bsize,
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF ("%s: Launching Slave Serial Load\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Serial Load\n", __func__);
 		ret_val = spartan2_ss_load(desc, buf, bsize);
 		break;
 
 	case slave_parallel:
-		PRINTF ("%s: Launching Slave Parallel Load\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Parallel Load\n", __func__);
 		ret_val = spartan2_sp_load(desc, buf, bsize);
 		break;
 
@@ -69,12 +65,12 @@ static int spartan2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF ("%s: Launching Slave Serial Dump\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Serial Dump\n", __func__);
 		ret_val = spartan2_ss_dump(desc, buf, bsize);
 		break;
 
 	case slave_parallel:
-		PRINTF ("%s: Launching Slave Parallel Dump\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Parallel Dump\n", __func__);
 		ret_val = spartan2_sp_dump(desc, buf, bsize);
 		break;
 
@@ -100,8 +96,8 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 	int ret_val = FPGA_FAIL;	/* assume the worst */
 	xilinx_spartan2_slave_parallel_fns *fn = desc->iface_fns;
 
-	PRINTF ("%s: start with interface functions @ 0x%p\n",
-			__FUNCTION__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		size_t bytecount = 0;
@@ -109,7 +105,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF ("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"pre: 0x%p\n"
@@ -124,7 +120,7 @@ static int spartan2_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				"busy:\t0x%p\n"
 				"abort:\t0x%p\n",
 				"post:\t0x%p\n\n",
-				__FUNCTION__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err,
+				__func__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err,
 				fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata, fn->busy,
 				fn->abort, fn->post);
 
@@ -302,8 +298,8 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 	int i;
 	unsigned char val;
 
-	PRINTF ("%s: start with interface functions @ 0x%p\n",
-			__FUNCTION__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		size_t bytecount = 0;
@@ -311,7 +307,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF ("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"pgm:\t0x%p\n"
@@ -319,7 +315,7 @@ static int spartan2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				"clk:\t0x%p\n"
 				"wr:\t0x%p\n"
 				"done:\t0x%p\n\n",
-				__FUNCTION__, &fn, fn, fn->pgm, fn->init,
+				__func__, &fn, fn, fn->pgm, fn->init,
 				fn->clk, fn->wr, fn->done);
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		printf ("Loading FPGA Device %d...\n", cookie);
Signature · 1 line
2.30.2
#7 lore raw

PATCH 6/7 fpga: spartan3: Use logging feature instead of FPGA_DEBUG

In reply to Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/spartan3.c | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)
drivers/fpga/spartan3.c +15 -19
index 918f6db506..7dd97db6ee 100644
@@ -9,16 +9,12 @@
  * on spartan2.c (Rich Ireland, [email protected]).
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 #include <common.h>		/* core U-Boot definitions */
+#include <log.h>
 #include <spartan3.h>		/* Spartan-II device family */
 
-/* Define FPGA_DEBUG to get debug printf's */
-#ifdef	FPGA_DEBUG
-#define PRINTF(fmt,args...)	printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
 #undef CONFIG_SYS_FPGA_CHECK_BUSY
 
 /* Note: The assumption is that we cannot possibly run fast enough to
@@ -51,12 +47,12 @@ static int spartan3_load(xilinx_desc *desc, const void *buf, size_t bsize,
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF ("%s: Launching Slave Serial Load\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Serial Load\n", __func__);
 		ret_val = spartan3_ss_load(desc, buf, bsize);
 		break;
 
 	case slave_parallel:
-		PRINTF ("%s: Launching Slave Parallel Load\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Parallel Load\n", __func__);
 		ret_val = spartan3_sp_load(desc, buf, bsize);
 		break;
 
@@ -74,12 +70,12 @@ static int spartan3_dump(xilinx_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF ("%s: Launching Slave Serial Dump\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Serial Dump\n", __func__);
 		ret_val = spartan3_ss_dump(desc, buf, bsize);
 		break;
 
 	case slave_parallel:
-		PRINTF ("%s: Launching Slave Parallel Dump\n", __FUNCTION__);
+		log_debug("%s: Launching Slave Parallel Dump\n", __func__);
 		ret_val = spartan3_sp_dump(desc, buf, bsize);
 		break;
 
@@ -105,8 +101,8 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 	int ret_val = FPGA_FAIL;	/* assume the worst */
 	xilinx_spartan3_slave_parallel_fns *fn = desc->iface_fns;
 
-	PRINTF ("%s: start with interface functions @ 0x%p\n",
-			__FUNCTION__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		size_t bytecount = 0;
@@ -114,7 +110,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF ("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"pre: 0x%p\n"
@@ -129,7 +125,7 @@ static int spartan3_sp_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				"busy:\t0x%p\n"
 				"abort:\t0x%p\n",
 				"post:\t0x%p\n\n",
-				__FUNCTION__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err,
+				__func__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err,
 				fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata, fn->busy,
 				fn->abort, fn->post);
 
@@ -309,8 +305,8 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 	int i;
 	unsigned char val;
 
-	PRINTF ("%s: start with interface functions @ 0x%p\n",
-			__FUNCTION__, fn);
+	log_debug("%s: start with interface functions @ 0x%p\n",
+		  __func__, fn);
 
 	if (fn) {
 		size_t bytecount = 0;
@@ -318,7 +314,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 		int cookie = desc->cookie;	/* make a local copy */
 		unsigned long ts;		/* timestamp */
 
-		PRINTF ("%s: Function Table:\n"
+		log_debug("%s: Function Table:\n"
 				"ptr:\t0x%p\n"
 				"struct: 0x%p\n"
 				"pgm:\t0x%p\n"
@@ -326,7 +322,7 @@ static int spartan3_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 				"clk:\t0x%p\n"
 				"wr:\t0x%p\n"
 				"done:\t0x%p\n\n",
-				__FUNCTION__, &fn, fn, fn->pgm, fn->init,
+				__func__, &fn, fn, fn->pgm, fn->init,
 				fn->clk, fn->wr, fn->done);
 #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
 		printf ("Loading FPGA Device %d...\n", cookie);
Signature · 1 line
2.30.2
#8 lore raw

PATCH 7/7 fpga: virtex2: Use logging feature instead of FPGA_DEBUG

In reply to Alexander Dahl

Instead of using DEBUG or LOG_DEBUG the driver still had its own definition for debug output.

---
 drivers/fpga/virtex2.c | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/fpga/virtex2.c +15 -22
index 51b8d31205..092a17db9c 100644
@@ -12,21 +12,14 @@
  * on spartan2.c (Rich Ireland, [email protected]).
  */
 
+#define LOG_CATEGORY UCLASS_FS_FIRMWARE_LOADER
+
 #include <common.h>
 #include <console.h>
+#include <log.h>
 #include <virtex2.h>
 #include <linux/delay.h>
 
-#if 0
-#define FPGA_DEBUG
-#endif
-
-#ifdef	FPGA_DEBUG
-#define	PRINTF(fmt, args...)	printf(fmt, ##args)
-#else
-#define PRINTF(fmt, args...)
-#endif
-
 /*
  * If the SelectMap interface can be overrun by the processor, define
  * CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board
@@ -89,12 +82,12 @@ static int virtex2_load(xilinx_desc *desc, const void *buf, size_t bsize,
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF("%s: Launching Slave Serial Load\n", __func__);
+		log_debug("%s: Launching Slave Serial Load\n", __func__);
 		ret_val = virtex2_ss_load(desc, buf, bsize);
 		break;
 
 	case slave_selectmap:
-		PRINTF("%s: Launching Slave Parallel Load\n", __func__);
+		log_debug("%s: Launching Slave Parallel Load\n", __func__);
 		ret_val = virtex2_ssm_load(desc, buf, bsize);
 		break;
 
@@ -111,12 +104,12 @@ static int virtex2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
 
 	switch (desc->iface) {
 	case slave_serial:
-		PRINTF("%s: Launching Slave Serial Dump\n", __func__);
+		log_debug("%s: Launching Slave Serial Dump\n", __func__);
 		ret_val = virtex2_ss_dump(desc, buf, bsize);
 		break;
 
 	case slave_parallel:
-		PRINTF("%s: Launching Slave Parallel Dump\n", __func__);
+		log_debug("%s: Launching Slave Parallel Dump\n", __func__);
 		ret_val = virtex2_ssm_dump(desc, buf, bsize);
 		break;
 
@@ -150,8 +143,8 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
 {
 	unsigned long ts;
 
-	PRINTF("%s:%d: Start with interface functions @ 0x%p\n",
-	       __func__, __LINE__, fn);
+	log_debug("%s:%d: Start with interface functions @ 0x%p\n",
+		  __func__, __LINE__, fn);
 
 	if (!fn) {
 		printf("%s:%d: NULL Interface function table!\n",
@@ -160,7 +153,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
 	}
 
 	/* Gotta split this one up (so the stack won't blow??) */
-	PRINTF("%s:%d: Function Table:\n"
+	log_debug("%s:%d: Function Table:\n"
 	       "  base   0x%p\n"
 	       "  struct 0x%p\n"
 	       "  pre    0x%p\n"
@@ -169,7 +162,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
 	       "  error  0x%p\n",
 	       __func__, __LINE__,
 	       &fn, fn, fn->pre, fn->pgm, fn->init, fn->err);
-	PRINTF("  clock  0x%p\n"
+	log_debug("  clock  0x%p\n"
 	       "  cs     0x%p\n"
 	       "  write  0x%p\n"
 	       "  rdata  0x%p\n"
@@ -330,8 +323,8 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 		if ((*fn->done)(cookie) == FPGA_SUCCESS) {
-			PRINTF("%s:%d:done went active early, bytecount = %d\n",
-			       __func__, __LINE__, bytecount);
+			log_debug("%s:%d:done went active early, bytecount = %d\n",
+				  __func__, __LINE__, bytecount);
 			break;
 		}
 
@@ -465,8 +458,8 @@ static int virtex2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
 #endif
 
 			if ((*fn->done)(cookie) == FPGA_SUCCESS) {
-				PRINTF("%s:%d:done went active early, bytecount = %d\n",
-				       __func__, __LINE__, bytecount);
+				log_debug("%s:%d:done went active early, bytecount = %d\n",
+					  __func__, __LINE__, bytecount);
 				break;
 			}
 
Signature · 1 line
2.30.2