Re: [Qemu-devel] [PATCH v3 03/12] sdcard: add a trace event for command responses

[Alistair Francis]

On Mon, Jan 22, 2018 at 7:21 PM, Philippe Mathieu-Daudé <address@hidden> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
>  hw/sd/sd.c         | 26 +++++++++++++++++++++++---
>  hw/sd/trace-events |  1 +
>  2 files changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index f876973a2b..3590099ce8 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -152,6 +152,26 @@ static const char *sd_state_name(enum SDCardStates 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;
> +    }

Same comments as patch number 2.

Alistair

> +    return response_name[rsp];
> +}
> +
>  static uint8_t sd_get_dat_lines(SDState *sd)
>  {
>      return sd->enable ? sd->dat_lines : 0;
> @@ -1595,10 +1615,12 @@ send_response:
>
>      case sd_r0:
>      case sd_illegal:
> -    default:
>          rsplen = 0;
>          break;
> +    default:
> +        g_assert_not_reached();
>      }
> +    trace_sdcard_response(sd_response_name(rtype), rsplen);
>
>      if (rtype != sd_illegal) {
>          /* Clear the "clear on valid command" status bits now we've
> @@ -1614,8 +1636,6 @@ send_response:
>          for (i = 0; i < rsplen; i++)
>              fprintf(stderr, " %02x", response[i]);
>          fputc('\n', stderr);
> -    } else {
> -        DPRINTF("No response %d\n", sd->state);
>      }
>  #endif
>
> diff --git a/hw/sd/trace-events b/hw/sd/trace-events
> index 75dac5a2cd..b2aa19ec0d 100644
> --- a/hw/sd/trace-events
> +++ b/hw/sd/trace-events
> @@ -26,6 +26,7 @@ sdhci_capareg(const char *desc, uint16_t val) "%s: %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_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_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 
> 0x%x"
>
> --
> 2.15.1
>
>