SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/char/riscv_htif: Convert HTIF_DEBUG() to trace events

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20250116223609.81594-1-philmd@linaro.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-16 23:36:09 +01:00 committed by Alistair Francis
parent 941f76e293
commit f04cac4f8f
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/char/riscv_htif.c
View File

@ -32,14 +32,7 @@
#include "exec/tswap.h" #include "exec/tswap.h"
#include "system/dma.h" #include "system/dma.h"
#include "system/runstate.h" #include "system/runstate.h"
#include "trace.h"
#define RISCV_DEBUG_HTIF 0
#define HTIF_DEBUG(fmt, ...) \
do { \
if (RISCV_DEBUG_HTIF) { \
qemu_log_mask(LOG_TRACE, "%s: " fmt "\n", __func__, ##__VA_ARGS__);\
} \
} while (0)
#define HTIF_DEV_SHIFT 56 #define HTIF_DEV_SHIFT 56
#define HTIF_CMD_SHIFT 48 #define HTIF_CMD_SHIFT 48
@ -159,8 +152,7 @@ static void htif_handle_tohost_write(HTIFState *s, uint64_t val_written)
uint64_t payload = val_written & 0xFFFFFFFFFFFFULL; uint64_t payload = val_written & 0xFFFFFFFFFFFFULL;
int resp = 0; int resp = 0;
HTIF_DEBUG("mtohost write: device: %d cmd: %d what: %02" PRIx64 trace_htif_uart_write_to_host(device, cmd, payload);
" -payload: %016" PRIx64 "\n", device, cmd, payload & 0xFF, payload);
/* /*
* Currently, there is a fixed mapping of devices: * Currently, there is a fixed mapping of devices:
@ -251,8 +243,7 @@ static void htif_handle_tohost_write(HTIFState *s, uint64_t val_written)
} }
} else { } else {
qemu_log("HTIF unknown device or command\n"); qemu_log("HTIF unknown device or command\n");
HTIF_DEBUG("device: %d cmd: %d what: %02" PRIx64 trace_htif_uart_unknown_device_command(device, cmd, payload);
" payload: %016" PRIx64, device, cmd, payload & 0xFF, payload);
} }
/* /*
* Latest bbl does not set fromhost to 0 if there is a value in tohost. * Latest bbl does not set fromhost to 0 if there is a value in tohost.

4
hw/char/trace-events
View File

@ -136,3 +136,7 @@ stm32f2xx_usart_read(char *id, unsigned size, uint64_t ofs, uint64_t val) " %s s
stm32f2xx_usart_write(char *id, unsigned size, uint64_t ofs, uint64_t val) "%s size %d ofs 0x%02" PRIx64 " <- 0x%02" PRIx64 stm32f2xx_usart_write(char *id, unsigned size, uint64_t ofs, uint64_t val) "%s size %d ofs 0x%02" PRIx64 " <- 0x%02" PRIx64
stm32f2xx_usart_drop(char *id) " %s dropping the chars" stm32f2xx_usart_drop(char *id) " %s dropping the chars"
stm32f2xx_usart_receive(char *id, uint8_t chr) " %s receiving '%c'" stm32f2xx_usart_receive(char *id, uint8_t chr) " %s receiving '%c'"
# riscv_htif.c
htif_uart_write_to_host(uint8_t device, uint8_t cmd, uint64_t payload) "device: %u cmd: %02u payload: %016" PRIx64
htif_uart_unknown_device_command(uint8_t device, uint8_t cmd, uint64_t payload) "device: %u cmd: %02u payload: %016" PRIx64