Message ID | 20180309153654.13518-2-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | SDCard: improve tracing, support UHS-I | expand |
On 9 March 2018 at 15:36, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Acked-by: Alistair Francis <alistair.francis@xilinx.com> > --- > hw/sd/sd.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 933890e86f..4a9520e38e 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -866,13 +866,18 @@ static void sd_lock_command(SDState *sd) > sd->card_status &= ~CARD_IS_LOCKED; > } > > -static sd_rsp_type_t sd_normal_command(SDState *sd, > - SDRequest req) > +static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > { > uint32_t rca = 0x0000; > uint64_t addr = (sd->ocr & (1 << 30)) ? (uint64_t) req.arg << 9 : req.arg; > > - trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state)); > + /* CMD55 precedes an ACMD, so we are not interested in tracing it. > + * However there is no ACMD55, so we want to trace this particular case. > + */ > + if (req.cmd != 55 || sd->expecting_acmd) { > + trace_sdcard_normal_command(req.cmd, req.arg, > + sd_state_name(sd->state)); > + } > > /* Not interpreting this as an app command */ > sd->card_status &= ~APP_CMD; > -- > 2.16.2 Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 933890e86f..4a9520e38e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -866,13 +866,18 @@ static void sd_lock_command(SDState *sd) sd->card_status &= ~CARD_IS_LOCKED; } -static sd_rsp_type_t sd_normal_command(SDState *sd, - SDRequest req) +static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; uint64_t addr = (sd->ocr & (1 << 30)) ? (uint64_t) req.arg << 9 : req.arg; - trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state)); + /* CMD55 precedes an ACMD, so we are not interested in tracing it. + * However there is no ACMD55, so we want to trace this particular case. + */ + if (req.cmd != 55 || sd->expecting_acmd) { + trace_sdcard_normal_command(req.cmd, req.arg, + sd_state_name(sd->state)); + } /* Not interpreting this as an app command */ sd->card_status &= ~APP_CMD;