OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/i2c/pm_smbus: Convert DPRINTF to trace events

Browse Source 
Let the trace messages slightly deviate from the function names
("smb" -> "smbus") being traced in order to avoid conflights with the SMB
protocol.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Message-id: 20231028122415.14869-6-shentey@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Bernhard Beschow 2023-10-28 14:24:14 +02:00 committed by Peter Maydell
parent 3839aff84c
commit c6e1b31bce
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/i2c/pm_smbus.c
View File

@ -23,6 +23,7 @@
#include "hw/i2c/pm_smbus.h" #include "hw/i2c/pm_smbus.h"
#include "hw/i2c/smbus_master.h" #include "hw/i2c/smbus_master.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "trace.h"
#define SMBHSTSTS 0x00 #define SMBHSTSTS 0x00
#define SMBHSTCNT 0x02 #define SMBHSTCNT 0x02
@ -64,15 +65,6 @@
#define AUX_BLK (1 << 1) #define AUX_BLK (1 << 1)
#define AUX_MASK 0x3 #define AUX_MASK 0x3
/*#define DEBUG*/
#ifdef DEBUG
# define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
#else
# define SMBUS_DPRINTF(format, ...) do { } while (0)
#endif
static void smb_transaction(PMSMBus *s) static void smb_transaction(PMSMBus *s)
{ {
uint8_t prot = (s->smb_ctl >> 2) & 0x07; uint8_t prot = (s->smb_ctl >> 2) & 0x07;
@ -82,7 +74,7 @@ static void smb_transaction(PMSMBus *s)
I2CBus *bus = s->smbus; I2CBus *bus = s->smbus;
int ret; int ret;
SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot); trace_smbus_transaction(addr, prot);
/* Transaction isn't exec if STS_DEV_ERR bit set */ /* Transaction isn't exec if STS_DEV_ERR bit set */
if ((s->smb_stat & STS_DEV_ERR) != 0) { if ((s->smb_stat & STS_DEV_ERR) != 0) {
goto error; goto error;
@ -258,8 +250,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
PMSMBus *s = opaque; PMSMBus *s = opaque;
uint8_t clear_byte_done; uint8_t clear_byte_done;
SMBUS_DPRINTF("SMB writeb port=0x%04" HWADDR_PRIx trace_smbus_ioport_writeb(addr, val);
" val=0x%02" PRIx64 "\n", addr, val);
switch(addr) { switch(addr) {
case SMBHSTSTS: case SMBHSTSTS:
clear_byte_done = s->smb_stat & val & STS_BYTE_DONE; clear_byte_done = s->smb_stat & val & STS_BYTE_DONE;
@ -429,8 +420,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width)
val = 0; val = 0;
break; break;
} }
SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", trace_smbus_ioport_readb(addr, val);
addr, val);
if (s->set_irq) { if (s->set_irq) {
s->set_irq(s, smb_irq_value(s)); s->set_irq(s, smb_irq_value(s));

6
hw/i2c/trace-events
View File

@ -15,6 +15,12 @@ i2c_send_async(uint8_t address, uint8_t data) "send_async(addr:0x%02x) data:0x%0
i2c_recv(uint8_t address, uint8_t data) "recv(addr:0x%02x) data:0x%02x" i2c_recv(uint8_t address, uint8_t data) "recv(addr:0x%02x) data:0x%02x"
i2c_ack(void) "" i2c_ack(void) ""
# pm_smbus.c
smbus_ioport_readb(uint16_t addr, uint8_t data) "[0x%04" PRIx16 "] -> val=0x%02x"
smbus_ioport_writeb(uint16_t addr, uint8_t data) "[0x%04" PRIx16 "] <- val=0x%02x"
smbus_transaction(uint8_t addr, uint8_t prot) "addr=0x%02x prot=0x%02x"
# allwinner_i2c.c # allwinner_i2c.c
allwinner_i2c_read(const char* reg_name, uint64_t offset, uint64_t value) "read %s [0x%" PRIx64 "]: -> 0x%" PRIx64 allwinner_i2c_read(const char* reg_name, uint64_t offset, uint64_t value) "read %s [0x%" PRIx64 "]: -> 0x%" PRIx64