Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 07:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fpga: virtex2: Use logging feature instead of FPGA_DEBUG

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

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20221007122003.11239-11-ada@thorsis.com
This commit is contained in:
Alexander Dahl 2022-10-07 14:20:03 +02:00 committed by Michal Simek
parent 1fda847114
commit 63c46e028c
1 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
drivers/fpga/virtex2.c
View file

@ -12,21 +12,14 @@
* on spartan2.c (Rich Ireland, rireland@enterasys.com). * on spartan2.c (Rich Ireland, rireland@enterasys.com).
*/ */
#define LOG_CATEGORY UCLASS_FPGA
#include <common.h> #include <common.h>
#include <console.h> #include <console.h>
#include <log.h>
#include <virtex2.h> #include <virtex2.h>
#include <linux/delay.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 * If the SelectMap interface can be overrun by the processor, define
* CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board * 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) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF("%s: Launching Slave Serial Load\n", __func__); log_debug("Launching Slave Serial Load\n");
ret_val = virtex2_ss_load(desc, buf, bsize); ret_val = virtex2_ss_load(desc, buf, bsize);
break; break;
case slave_selectmap: case slave_selectmap:
PRINTF("%s: Launching Slave Parallel Load\n", __func__); log_debug("Launching Slave Parallel Load\n");
ret_val = virtex2_ssm_load(desc, buf, bsize); ret_val = virtex2_ssm_load(desc, buf, bsize);
break; break;
@ -111,12 +104,12 @@ static int virtex2_dump(xilinx_desc *desc, const void *buf, size_t bsize)
switch (desc->iface) { switch (desc->iface) {
case slave_serial: case slave_serial:
PRINTF("%s: Launching Slave Serial Dump\n", __func__); log_debug("Launching Slave Serial Dump\n");
ret_val = virtex2_ss_dump(desc, buf, bsize); ret_val = virtex2_ss_dump(desc, buf, bsize);
break; break;
case slave_parallel: case slave_parallel:
PRINTF("%s: Launching Slave Parallel Dump\n", __func__); log_debug("Launching Slave Parallel Dump\n");
ret_val = virtex2_ssm_dump(desc, buf, bsize); ret_val = virtex2_ssm_dump(desc, buf, bsize);
break; break;
@ -150,8 +143,7 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
{ {
unsigned long ts; unsigned long ts;
PRINTF("%s:%d: Start with interface functions @ 0x%p\n", log_debug("Start with interface functions @ 0x%p\n", fn);
__func__, __LINE__, fn);
if (!fn) { if (!fn) {
printf("%s:%d: NULL Interface function table!\n", printf("%s:%d: NULL Interface function table!\n",
@ -160,25 +152,24 @@ static int virtex2_slave_pre(xilinx_virtex2_slave_fns *fn, int cookie)
} }
/* Gotta split this one up (so the stack won't blow??) */ /* Gotta split this one up (so the stack won't blow??) */
PRINTF("%s:%d: Function Table:\n" log_debug("Function Table:\n"
" base 0x%p\n" " base 0x%p\n"
" struct 0x%p\n" " struct 0x%p\n"
" pre 0x%p\n" " pre 0x%p\n"
" prog 0x%p\n" " prog 0x%p\n"
" init 0x%p\n" " init 0x%p\n"
" error 0x%p\n", " error 0x%p\n",
__func__, __LINE__, &fn, fn, fn->pre, fn->pgm, fn->init, fn->err);
&fn, fn, fn->pre, fn->pgm, fn->init, fn->err); log_debug(" clock 0x%p\n"
PRINTF(" clock 0x%p\n" " cs 0x%p\n"
" cs 0x%p\n" " write 0x%p\n"
" write 0x%p\n" " rdata 0x%p\n"
" rdata 0x%p\n" " wdata 0x%p\n"
" wdata 0x%p\n" " busy 0x%p\n"
" busy 0x%p\n" " abort 0x%p\n"
" abort 0x%p\n" " post 0x%p\n\n",
" post 0x%p\n\n", fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata,
fn->clk, fn->cs, fn->wr, fn->rdata, fn->wdata, fn->busy, fn->abort, fn->post);
fn->busy, fn->abort, fn->post);
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf("Initializing FPGA Device %d...\n", cookie); printf("Initializing FPGA Device %d...\n", cookie);
@ -330,8 +321,8 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
#endif #endif
if ((*fn->done)(cookie) == FPGA_SUCCESS) { if ((*fn->done)(cookie) == FPGA_SUCCESS) {
PRINTF("%s:%d:done went active early, bytecount = %zu\n", log_debug("done went active early, bytecount = %zu\n",
__func__, __LINE__, bytecount); bytecount);
break; break;
} }
@ -465,8 +456,8 @@ static int virtex2_ss_load(xilinx_desc *desc, const void *buf, size_t bsize)
#endif #endif
if ((*fn->done)(cookie) == FPGA_SUCCESS) { if ((*fn->done)(cookie) == FPGA_SUCCESS) {
PRINTF("%s:%d:done went active early, bytecount = %zu\n", log_debug("done went active early, bytecount = %zu\n",
__func__, __LINE__, bytecount); bytecount);
break; break;
} }