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

sdcard: add a trace event for command responses

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180215220540.6556-4-f4bug@amsat.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-02-22 15:12:52 +00:00 committed by Peter Maydell
parent 1b640aa929
commit 5592193231
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/sd/sd.c
View File

@ -153,6 +153,27 @@ static const char *sd_state_name(enum SDCardStates state)
return state_name[state]; return state_name[state];
} }
static const char *sd_response_name(sd_rsp_type_t rsp)
{
static const char *response_name[] = {
[sd_r0] = "RESP#0 (no response)",
[sd_r1] = "RESP#1 (normal cmd)",
[sd_r2_i] = "RESP#2 (CID reg)",
[sd_r2_s] = "RESP#2 (CSD reg)",
[sd_r3] = "RESP#3 (OCR reg)",
[sd_r6] = "RESP#6 (RCA)",
[sd_r7] = "RESP#7 (operating voltage)",
};
if (rsp == sd_illegal) {
return "ILLEGAL RESP";
}
if (rsp == sd_r1b) {
rsp = sd_r1;
}
assert(rsp <= ARRAY_SIZE(response_name));
return response_name[rsp];
}
static uint8_t sd_get_dat_lines(SDState *sd) static uint8_t sd_get_dat_lines(SDState *sd)
{ {
return sd->enable ? sd->dat_lines : 0; return sd->enable ? sd->dat_lines : 0;
@ -1596,10 +1617,12 @@ send_response:
case sd_r0: case sd_r0:
case sd_illegal: case sd_illegal:
default:
rsplen = 0; rsplen = 0;
break; break;
default:
g_assert_not_reached();
} }
trace_sdcard_response(sd_response_name(rtype), rsplen);
if (rtype != sd_illegal) { if (rtype != sd_illegal) {
/* Clear the "clear on valid command" status bits now we've /* Clear the "clear on valid command" status bits now we've
@ -1616,8 +1639,6 @@ send_response:
DPRINTF(" %02x", response[i]); DPRINTF(" %02x", response[i]);
} }
DPRINTF(" state %d\n", sd->state); DPRINTF(" state %d\n", sd->state);
} else {
DPRINTF("No response %d\n", sd->state);
} }
#endif #endif

1
hw/sd/trace-events
View File

@ -26,6 +26,7 @@ sdhci_capareg(const char *desc, uint16_t val) "%s: %u"
# hw/sd/sd.c # hw/sd/sd.c
sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d arg 0x%08x (state %s)" sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d arg 0x%08x (state %s)"
sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x" sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x"
sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)"
sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"