[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/25] sdcard: Do not trace CMD55, except when we alr
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 20/25] sdcard: Do not trace CMD55, except when we already expect an ACMD |
Date: |
Fri, 9 Mar 2018 17:26:17 +0000 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
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
- [Qemu-devel] [PULL 07/25] aarch64-linux-user: Split out helpers for guest signal handling, (continued)
- [Qemu-devel] [PULL 07/25] aarch64-linux-user: Split out helpers for guest signal handling, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 02/25] hw/arm: Set the core count for Xilinx's ZynqMP, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 22/25] sdcard: Display which protocol is used when tracing (SD or SPI), Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 21/25] sdcard: Display command name when tracing CMD/ACMD, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 01/25] target/arm: Add a core count property, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 14/25] target/arm: Query host CPU features on-demand at instance init, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 05/25] Implement support for i.MX7 Sabre board, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 18/25] hw/arm/virt: Add "max" to the list of CPU types "virt" supports, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 03/25] pci: Add support for Designware IP block, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 17/25] target/arm: Make 'any' CPU just an alias for 'max', Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 20/25] sdcard: Do not trace CMD55, except when we already expect an ACMD,
Peter Maydell <=
- [Qemu-devel] [PULL 24/25] sdhci: Fix a typo in comment, Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 25/25] MAINTAINERS: Add entries for SD (SDHCI, SDBus, SDCard), Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 04/25] i.MX: Add i.MX7 SOC implementation., Peter Maydell, 2018/03/09
- [Qemu-devel] [PULL 23/25] sdcard: Add the Tuning Command (CMD19), Peter Maydell, 2018/03/09
- Re: [Qemu-devel] [PULL 00/25] target-arm queue, Peter Maydell, 2018/03/12