[22/26] sdcard: reduce sd_cmd traces

Message ID	20171213232025.24503-23-f4bug@amsat.org
State	Superseded, archived
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: Alistair Francis <alistair.francis@xilinx.com>, "Edgar E . Iglesias" <edgar.iglesias@xilinx.com>, Peter Maydell <peter.maydell@linaro.org>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Prasad J Pandit <pjp@fedoraproject.org>, Clement Deschamps <clement.deschamps@antfield.fr> Date: Wed, 13 Dec 2017 20:20:21 -0300 Message-Id: <20171213232025.24503-23-f4bug@amsat.org> In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org> References: <20171213232025.24503-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 22/26] sdcard: reduce sd_cmd traces Precedence: list Cc: Sai Pavan Boddu <saipava@xilinx.com>, Peter Crosthwaite <crosthwaite.peter@gmail.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	SDCard housekeeping \| expand [00/26] SDCard housekeeping [RFC,02/26] sdcard: add a Python qtest [03/26] sdcard: use ldst API [04/26] sdcard: replace fprintf() -> qemu_log_mask() [05/26] sdcard: rename sd_set_mode() -> sd_update_mode() [06/26] sdcard: add sd_set_mode() [07/26] sdcard: add sdcard_set_mode() trace event [08/26] sdcard: add sd_set_state() [09/26] sdcard: add a sdcard_set_state() trace event [10/26] sdcard: use more detailled state/mode trace events [11/26] sdcard: use warn_report() instead of fprintf() [12/26] sdcard: replace DPRINTF() by trace events [13/26] sdcard: add more trace events [RFC,14/26] sdcard: use qemu_hexbuf_strdup() to trace command response [15/26] sdcard: use PW_LEN define instead of '16' magic [16/26] sdcard: let cmd_valid_while_locked() returns a bool [17/26] sdcard: rename sd_set_REG() functions called by sd_reset() as sd_reset_REG() [18/26] sdcard: move Memory Card registers together [19/26] sdcard: add DSR register [20/26] sdcard: add/use SD_CMD_MAX to check valid SD commands [21/26] sdcard: add sd_cmd_abbreviation() to resolve the SD command id [22/26] sdcard: reduce sd_cmd traces [23/26] sdcard: add ACMD trace events [24/26] sdcard: use a 16-bit type for the 16-bit RCA register [25/26] sdcard: add/use a SDCardCommandClass enum instead of magic numbers [26/26] sdcard: add/use a ccc_spi enum for the commands supported in SPI mode

Message ID

20171213232025.24503-23-f4bug@amsat.org

State

Superseded, archived

Headers

From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>,
	"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Andrew Baumann <Andrew.Baumann@microsoft.com>,
	Prasad J Pandit <pjp@fedoraproject.org>,
	Clement Deschamps <clement.deschamps@antfield.fr>
Date: Wed, 13 Dec 2017 20:20:21 -0300
Message-Id: <20171213232025.24503-23-f4bug@amsat.org>
In-Reply-To: <20171213232025.24503-1-f4bug@amsat.org>
References: <20171213232025.24503-1-f4bug@amsat.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH 22/26] sdcard: reduce sd_cmd traces
Precedence: list
Cc: Sai Pavan Boddu <saipava@xilinx.com>, Peter Crosthwaite
	<crosthwaite.peter@gmail.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<f4bug@amsat.org>, 	qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

SDCard housekeeping | expand

Commit Message

Philippe Mathieu-Daudé Dec. 13, 2017, 11:20 p.m. UTC

Do not trace CMD55 used to start an ACMD.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sd/sd.c         | 6 ++++--
 hw/sd/trace-events | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index c50ac752d4..8104d6c055 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -826,8 +826,10 @@  static sd_rsp_type_t sd_normal_command(SDState *sd,
     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),
-                                sd_cmd_abbreviation(req.cmd));
+    if (req.cmd != 55 || sd->expecting_acmd) {
+        trace_sdcard_normal_command(sd_cmd_abbreviation(req.cmd), req.cmd,
+                                    req.arg, sd_state_name(sd->state));
+    }
 
     /* Not interpreting this as an app command */
     sd->card_status &= ~APP_CMD;
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index f3714a6dc5..412f01a832 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -24,7 +24,7 @@  sdhci_led(bool state) "LED: %u"
 # hw/sd/sd.c
 sdcard_set_mode(const char *current_mode, const char *new_mode, const char *state) "%s -> %s (state: %s)"
 sdcard_set_state(const char *current_state, const char *new_state, const char *mode) "%s -> %s (mode: %s)"
-sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state, const char *cmd_desc) "CMD%d arg 0x%08x (state %s) %s"
+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_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x"
 sdcard_command_response(const char *hexdump, const char *state) "%s (state %s)"
 sdcard_reset(void) ""

[22/26] sdcard: reduce sd_cmd traces

Commit Message

Patch