sdcard: Display which protocol is used when tracing (SD or SPI)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 20180309153654.13518-4-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
2ed61fb57b
commit
75a96f5e1c
14
hw/sd/sd.c
14
hw/sd/sd.c
|
@ -120,6 +120,7 @@ struct SDState {
|
||||||
qemu_irq readonly_cb;
|
qemu_irq readonly_cb;
|
||||||
qemu_irq inserted_cb;
|
qemu_irq inserted_cb;
|
||||||
QEMUTimer *ocr_power_timer;
|
QEMUTimer *ocr_power_timer;
|
||||||
|
const char *proto_name;
|
||||||
bool enable;
|
bool enable;
|
||||||
uint8_t dat_lines;
|
uint8_t dat_lines;
|
||||||
bool cmd_line;
|
bool cmd_line;
|
||||||
|
@ -875,7 +876,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
||||||
* However there is no ACMD55, so we want to trace this particular case.
|
* However there is no ACMD55, so we want to trace this particular case.
|
||||||
*/
|
*/
|
||||||
if (req.cmd != 55 || sd->expecting_acmd) {
|
if (req.cmd != 55 || sd->expecting_acmd) {
|
||||||
trace_sdcard_normal_command(sd_cmd_name(req.cmd), req.cmd,
|
trace_sdcard_normal_command(sd->proto_name,
|
||||||
|
sd_cmd_name(req.cmd), req.cmd,
|
||||||
req.arg, sd_state_name(sd->state));
|
req.arg, sd_state_name(sd->state));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1455,7 +1457,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
|
||||||
static sd_rsp_type_t sd_app_command(SDState *sd,
|
static sd_rsp_type_t sd_app_command(SDState *sd,
|
||||||
SDRequest req)
|
SDRequest req)
|
||||||
{
|
{
|
||||||
trace_sdcard_app_command(sd_acmd_name(req.cmd),
|
trace_sdcard_app_command(sd->proto_name, sd_acmd_name(req.cmd),
|
||||||
req.cmd, req.arg, sd_state_name(sd->state));
|
req.cmd, req.arg, sd_state_name(sd->state));
|
||||||
sd->card_status |= APP_CMD;
|
sd->card_status |= APP_CMD;
|
||||||
switch (req.cmd) {
|
switch (req.cmd) {
|
||||||
|
@ -1771,7 +1773,8 @@ void sd_write_data(SDState *sd, uint8_t value)
|
||||||
if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION))
|
if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
trace_sdcard_write_data(sd_acmd_name(sd->current_cmd),
|
trace_sdcard_write_data(sd->proto_name,
|
||||||
|
sd_acmd_name(sd->current_cmd),
|
||||||
sd->current_cmd, value);
|
sd->current_cmd, value);
|
||||||
switch (sd->current_cmd) {
|
switch (sd->current_cmd) {
|
||||||
case 24: /* CMD24: WRITE_SINGLE_BLOCK */
|
case 24: /* CMD24: WRITE_SINGLE_BLOCK */
|
||||||
|
@ -1910,7 +1913,8 @@ uint8_t sd_read_data(SDState *sd)
|
||||||
|
|
||||||
io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len;
|
io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len;
|
||||||
|
|
||||||
trace_sdcard_read_data(sd_acmd_name(sd->current_cmd),
|
trace_sdcard_read_data(sd->proto_name,
|
||||||
|
sd_acmd_name(sd->current_cmd),
|
||||||
sd->current_cmd, io_len);
|
sd->current_cmd, io_len);
|
||||||
switch (sd->current_cmd) {
|
switch (sd->current_cmd) {
|
||||||
case 6: /* CMD6: SWITCH_FUNCTION */
|
case 6: /* CMD6: SWITCH_FUNCTION */
|
||||||
|
@ -2037,6 +2041,8 @@ static void sd_realize(DeviceState *dev, Error **errp)
|
||||||
SDState *sd = SD_CARD(dev);
|
SDState *sd = SD_CARD(dev);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
sd->proto_name = sd->spi ? "SPI" : "SD";
|
||||||
|
|
||||||
if (sd->blk && blk_is_read_only(sd->blk)) {
|
if (sd->blk && blk_is_read_only(sd->blk)) {
|
||||||
error_setg(errp, "Cannot use read-only drive as SD card");
|
error_setg(errp, "Cannot use read-only drive as SD card");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -24,8 +24,8 @@ sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of
|
||||||
sdhci_capareg(const char *desc, uint16_t val) "%s: %u"
|
sdhci_capareg(const char *desc, uint16_t val) "%s: %u"
|
||||||
|
|
||||||
# hw/sd/sd.c
|
# hw/sd/sd.c
|
||||||
sdcard_normal_command(const char *cmd_desc, uint8_t cmd, uint32_t arg, const char *state) "%20s/ CMD%02d arg 0x%08x (state %s)"
|
sdcard_normal_command(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t arg, const char *state) "%s %20s/ CMD%02d arg 0x%08x (state %s)"
|
||||||
sdcard_app_command(const char *acmd_desc, uint8_t acmd, uint32_t arg, const char *state) "%23s/ACMD%02d arg 0x%08x (state %s)"
|
sdcard_app_command(const char *proto, const char *acmd_desc, uint8_t acmd, uint32_t arg, const char *state) "%s %23s/ACMD%02d arg 0x%08x (state %s)"
|
||||||
sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)"
|
sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)"
|
||||||
sdcard_powerup(void) ""
|
sdcard_powerup(void) ""
|
||||||
sdcard_inquiry_cmd41(void) ""
|
sdcard_inquiry_cmd41(void) ""
|
||||||
|
@ -39,8 +39,8 @@ sdcard_lock(void) ""
|
||||||
sdcard_unlock(void) ""
|
sdcard_unlock(void) ""
|
||||||
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"
|
||||||
sdcard_write_data(const char *cmd_desc, uint8_t cmd, uint8_t value) "%20s/ CMD%02d value 0x%02x"
|
sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint8_t value) "%s %20s/ CMD%02d value 0x%02x"
|
||||||
sdcard_read_data(const char *cmd_desc, uint8_t cmd, int length) "%20s/ CMD%02d len %d"
|
sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, int length) "%s %20s/ CMD%02d len %d"
|
||||||
sdcard_set_voltage(uint16_t millivolts) "%u mV"
|
sdcard_set_voltage(uint16_t millivolts) "%u mV"
|
||||||
|
|
||||||
# hw/sd/milkymist-memcard.c
|
# hw/sd/milkymist-memcard.c
|
||||||
|
|
Loading…
Reference in a new issue