david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/sd/bcm2835_sdhost: Add tracepoints

Browse Source 
Add some tracepoints to the bcm2835_sdhost driver, to assist
debugging.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180319161556.16446-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-04-10 13:02:25 +01:00
parent c4869ca630
commit b318f3265c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/sd/bcm2835_sdhost.c
View File

@ -15,6 +15,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "hw/sd/bcm2835_sdhost.h" #include "hw/sd/bcm2835_sdhost.h"
#include "trace.h"
#define TYPE_BCM2835_SDHOST_BUS "bcm2835-sdhost-bus" #define TYPE_BCM2835_SDHOST_BUS "bcm2835-sdhost-bus"
#define BCM2835_SDHOST_BUS(obj) \ #define BCM2835_SDHOST_BUS(obj) \
@ -99,6 +100,7 @@ static void bcm2835_sdhost_update_irq(BCM2835SDHostState *s)
{ {
uint32_t irq = s->status & uint32_t irq = s->status &
(SDHSTS_BUSY_IRPT | SDHSTS_BLOCK_IRPT | SDHSTS_SDIO_IRPT); (SDHSTS_BUSY_IRPT | SDHSTS_BLOCK_IRPT | SDHSTS_SDIO_IRPT);
trace_bcm2835_sdhost_update_irq(irq);
qemu_set_irq(s->irq, !!irq); qemu_set_irq(s->irq, !!irq);
} }
@ -211,6 +213,7 @@ static void bcm2835_sdhost_fifo_run(BCM2835SDHostState *s)
s->edm &= ~0xf; s->edm &= ~0xf;
s->edm |= SDEDM_FSM_DATAMODE; s->edm |= SDEDM_FSM_DATAMODE;
trace_bcm2835_sdhost_edm_change("datacnt 0", s->edm);
if (s->config & SDHCFG_DATA_IRPT_EN) { if (s->config & SDHCFG_DATA_IRPT_EN) {
s->status |= SDHSTS_SDIO_IRPT; s->status |= SDHSTS_SDIO_IRPT;
@ -229,6 +232,7 @@ static void bcm2835_sdhost_fifo_run(BCM2835SDHostState *s)
s->edm &= ~(0x1f << 4); s->edm &= ~(0x1f << 4);
s->edm |= ((s->fifo_len & 0x1f) << 4); s->edm |= ((s->fifo_len & 0x1f) << 4);
trace_bcm2835_sdhost_edm_change("fifo run", s->edm);
} }
static uint64_t bcm2835_sdhost_read(void *opaque, hwaddr offset, static uint64_t bcm2835_sdhost_read(void *opaque, hwaddr offset,
@ -280,6 +284,8 @@ static uint64_t bcm2835_sdhost_read(void *opaque, hwaddr offset,
break; break;
} }
trace_bcm2835_sdhost_read(offset, res, size);
return res; return res;
} }
@ -288,6 +294,8 @@ static void bcm2835_sdhost_write(void *opaque, hwaddr offset,
{ {
BCM2835SDHostState *s = (BCM2835SDHostState *)opaque; BCM2835SDHostState *s = (BCM2835SDHostState *)opaque;
trace_bcm2835_sdhost_write(offset, value, size);
switch (offset) { switch (offset) {
case SDCMD: case SDCMD:
s->cmd = value; s->cmd = value;
@ -314,6 +322,7 @@ static void bcm2835_sdhost_write(void *opaque, hwaddr offset,
value &= ~0xf; value &= ~0xf;
} }
s->edm = value; s->edm = value;
trace_bcm2835_sdhost_edm_change("guest register write", s->edm);
break; break;
case SDHCFG: case SDHCFG:
s->config = value; s->config = value;
@ -390,6 +399,7 @@ static void bcm2835_sdhost_reset(DeviceState *dev)
s->cmd = 0; s->cmd = 0;
s->cmdarg = 0; s->cmdarg = 0;
s->edm = 0x0000c60f; s->edm = 0x0000c60f;
trace_bcm2835_sdhost_edm_change("device reset", s->edm);
s->config = 0; s->config = 0;
s->hbct = 0; s->hbct = 0;
s->hblc = 0; s->hblc = 0;

6
hw/sd/trace-events
View File

@ -1,5 +1,11 @@
# See docs/devel/tracing.txt for syntax documentation. # See docs/devel/tracing.txt for syntax documentation.
# hw/sd/bcm2835_sdhost.c
bcm2835_sdhost_read(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
bcm2835_sdhost_write(uint64_t offset, uint64_t data, unsigned size) "offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u"
bcm2835_sdhost_edm_change(const char *why, uint32_t edm) "(%s) EDM now 0x%x"
bcm2835_sdhost_update_irq(uint32_t irq) "IRQ bits 0x%x\n"
# hw/sd/core.c # hw/sd/core.c
sdbus_command(const char *bus_name, uint8_t cmd, uint32_t arg, uint8_t crc) "@%s CMD%02d arg 0x%08x crc 0x%02x" sdbus_command(const char *bus_name, uint8_t cmd, uint32_t arg, uint8_t crc) "@%s CMD%02d arg 0x%08x crc 0x%02x"
sdbus_read(const char *bus_name, uint8_t value) "@%s value 0x%02x" sdbus_read(const char *bus_name, uint8_t value) "@%s value 0x%02x"