[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/25] sdcard: add more trace events
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 03/25] sdcard: add more trace events |
Date: |
Wed, 3 Jan 2018 18:24:14 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sd.c | 12 ++++++++++++
hw/sd/trace-events | 8 ++++++++
2 files changed, 20 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index df2e099151..f0eaac4d42 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -440,6 +440,7 @@ static void sd_reset(DeviceState *dev)
uint64_t size;
uint64_t sect;
+ trace_sdcard_reset();
if (sd->blk) {
blk_get_geometry(sd->blk, §);
} else {
@@ -491,7 +492,10 @@ static void sd_cardchange(void *opaque, bool load, Error
**errp)
bool readonly = sd_get_readonly(sd);
if (inserted) {
+ trace_sdcard_inserted(readonly);
sd_reset(dev);
+ } else {
+ trace_sdcard_ejected();
}
/* The IRQ notification is for legacy non-QOM SD controller devices;
@@ -623,6 +627,7 @@ static void sd_erase(SDState *sd)
uint64_t erase_start = sd->erase_start;
uint64_t erase_end = sd->erase_end;
+ trace_sdcard_erase();
if (!sd->erase_start || !sd->erase_end) {
sd->card_status |= ERASE_SEQ_ERROR;
return;
@@ -712,6 +717,11 @@ static void sd_lock_command(SDState *sd)
else
pwd_len = 0;
+ if (lock) {
+ trace_sdcard_lock();
+ } else {
+ trace_sdcard_unlock();
+ }
if (erase) {
if (!(sd->card_status & CARD_IS_LOCKED) || sd->blk_len > 1 ||
set_pwd || clr_pwd || lock || sd->wp_switch ||
@@ -1635,6 +1645,7 @@ void sd_write_data(SDState *sd, uint8_t value)
if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION))
return;
+ trace_sdcard_write_data(value);
switch (sd->current_cmd) {
case 24: /* CMD24: WRITE_SINGLE_BLOCK */
sd->data[sd->data_offset ++] = value;
@@ -1772,6 +1783,7 @@ uint8_t sd_read_data(SDState *sd)
io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len;
+ trace_sdcard_read_data(io_len);
switch (sd->current_cmd) {
case 6: /* CMD6: SWITCH_FUNCTION */
ret = sd->data[sd->data_offset ++];
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index 86c1687572..727d6fd904 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -18,8 +18,16 @@ sdhci_led(bool state) "LED: %u"
# hw/sd/sd.c
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_reset(void) ""
+sdcard_inserted(bool readonly) "read_only: %d"
+sdcard_ejected(void) ""
+sdcard_erase(void) ""
+sdcard_lock(void) ""
+sdcard_unlock(void) ""
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_data(uint8_t value) "value 0x%02x"
+sdcard_read_data(int length) "len %d"
# hw/sd/milkymist-memcard.c
milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x
value 0x%08x"
--
2.15.1
- [Qemu-devel] [PATCH v2 00/25] SDCard: housekeeping, improve SPI, introduce new Specs, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 01/25] sdcard: reorder SDState struct members, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 02/25] sdcard: replace DPRINTF() by trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 03/25] sdcard: add more trace events,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 04/25] sdcard: define SDCARD_CMD_MAX instead of using the magic '64', Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 05/25] sdcard: display command name when tracing CMD/ACMD, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 06/25] sdcard: let cmd_valid_while_locked() returns a bool, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 07/25] sdcard: rename sd_set_$REG() functions called once as sd_reset_$REG(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 08/25] sdcard: use the registerfields API to access the OCR register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 09/25] sdcard: use G_BYTE from cutils, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 10/25] sdcard: remove unreachable code, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 13/25] sdcard: let function handling response codes returns the response size, Philippe Mathieu-Daudé, 2018/01/03