From nobody Mon Feb 9 22:20:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513208260262870.6891218200302; Wed, 13 Dec 2017 15:37:40 -0800 (PST) Received: from localhost ([::1]:38314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGak-0000bz-G9 for importer@patchew.org; Wed, 13 Dec 2017 18:37:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePGMx-0006Qq-Cs for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePGMw-0000HS-8f for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:19 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:41083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePGMw-0000HG-2y for qemu-devel@nongnu.org; Wed, 13 Dec 2017 18:23:18 -0500 Received: by mail-qk0-x241.google.com with SMTP id 84so4157590qks.8 for ; Wed, 13 Dec 2017 15:23:18 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l1sm1666918qkk.74.2017.12.13.15.23.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 15:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+/Gl9Rv3zvEsevVd6dOFu9jPbiOVo4Y5pcc5lFPHfoA=; b=hLPHbCWYL1AYlaWt27w1J3KSOQp6/Ofpx/11v65sSKSAWqf7qZ+V5iVWgKvV0JyEtx HcEWmY1I7omAmeXIB4xbieb4J0EyyyptphNeVW9tkm9qq/32swgtasoO3jw7rSTndLrr m8jsWlaIwFy5LYFpItHLlHiUW0bIcDrbIQObixjFFLTvZuWqIe2Ys+btwzmNgtgYFPbP oxP6Dq4aBDld98suhnVxjSEsdGrKbnYF5wYWF6BRO7LmNnMOvLHVXpWOpHPCHuvuyLhs 9rxPl6fjWOeEeMkgWs6fPx+FKcUJH75sIB+qYJLyXuybeRKKYMP459LAPzzEEqZvGvgk 4+Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+/Gl9Rv3zvEsevVd6dOFu9jPbiOVo4Y5pcc5lFPHfoA=; b=Syxs8GcDYf8yyG0LB/u9LV/tlIor0pH4vXFM0krtKmhw/QmrwpqPhb1fZXelg7Gblx SAbKx0HFfNtsGAl2lvSqs2F4Ii0gQRQ6pp3P7KT1799E+Jymc0gdtYazfnT2YHJ//AiF dB1/WH93aUjejdMIw0qTSxWyf2/Dqt1xcFW3uSCu2xB5DDlFPTk4CEx7MqufsgUYEUuJ XgyBE83NRIDJYCihF9qaEdFExPW7ms/FyIxJJIrJigEdMLdmdhqNxYi4dQPYyHRZojER YjMlkVaYfgCjyewEC2b48LUDeM/jOMiRp9g2rsGHJxw17NbmmFbxFeeh//xuA/cQ3/W3 ta+g== X-Gm-Message-State: AKGB3mJkTt34ts2lRCJ8b/u6ajIOqAvcq/zUZs5PLqx9dV/xWsBh2JSJ 2KHeBTXH7pTMXJRN1xs9p38= X-Google-Smtp-Source: ACJfBoverQRKcl1n0h4ldwuFoivH/qJZgiDmBPFkd5jqLLPRdkH8TWqIAGaWPKwZ9GRwJESMsnyB7g== X-Received: by 10.55.191.1 with SMTP id p1mr13176262qkf.152.1513207397660; Wed, 13 Dec 2017 15:23:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrew Baumann , Prasad J Pandit , Clement Deschamps Date: Wed, 13 Dec 2017 20:20:20 -0300 Message-Id: <20171213232025.24503-22-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 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: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 21/26] sdcard: add sd_cmd_abbreviation() to resolve the SD command id X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This simplify reading trace output :) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 42 +++++++++++++++++++++++++++++++++++++++++- hw/sd/trace-events | 2 +- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 99678c89d5..c50ac752d4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -200,6 +200,45 @@ static void sd_set_state(SDState *sd, enum SDCardState= s state) =20 #define SD_CMD_MAX 64 =20 +static const char *sd_cmd_abbreviation(uint8_t cmd) +{ + static const char *cmd_abbrev[SD_CMD_MAX] =3D { + [0] =3D "GO_IDLE_STATE", + [2] =3D "ALL_SEND_CID", [3] =3D "SEND_RELATIVE_A= DDR", + [4] =3D "SET_DSR", [5] =3D "IO_SEND_OP_COND= ", + [6] =3D "SWITCH_FUNC", [7] =3D "SELECT/DESELECT= _CARD", + [8] =3D "SEND_IF_COND", [9] =3D "SEND_CSD", + [10] =3D "SEND_CID", [11] =3D "VOLTAGE_SWITCH", + [12] =3D "STOP_TRANSMISSION", [13] =3D "SEND_STATUS", + [15] =3D "GO_INACTIVE_STATE= ", + [16] =3D "SET_BLOCKLEN", [17] =3D "READ_SINGLE_BLO= CK", + [18] =3D "READ_MULTIPLE_BLOCK", [19] =3D "SEND_TUNING_BLO= CK", + [20] =3D "SPEED_CLASS_CONTROL", [21] =3D "DPS_spec", + [23] =3D "SET_BLOCK_COUNT", + [24] =3D "WRITE_BLOCK", [25] =3D "WRITE_MULTIPLE_= BLOCK", + [26] =3D "MANUF_RSVD", [27] =3D "PROGRAM_CSD", + [28] =3D "SET_WRITE_PROT", [29] =3D "CLR_WRITE_PROT", + [30] =3D "SEND_WRITE_PROT", + [32] =3D "ERASE_WR_BLK_START", [33] =3D "ERASE_WR_BLK_EN= D", + [34] =3D "SW_FUNC_RSVD", [35] =3D "SW_FUNC_RSVD", + [36] =3D "SW_FUNC_RSVD", [37] =3D "SW_FUNC_RSVD", + [38] =3D "ERASE", + [40] =3D "DPS_spec", + [42] =3D "LOCK_UNLOCK", [43] =3D "Q_MANAGEMENT", + [44] =3D "Q_TASK_INFO_A", [45] =3D "Q_TASK_INFO_B", + [46] =3D "Q_RD_TASK", [47] =3D "Q_WR_TASK", + [48] =3D "READ_EXTR_SINGLE", [49] =3D "WRITE_EXTR_SING= LE", + [50] =3D "SW_FUNC_RSVD", /* FIXME */ + [52] =3D "IO_RW_DIRECT", [53] =3D "IO_RW_EXTENDED", + [54] =3D "SDIO_RSVD", [55] =3D "APP_CMD", + [56] =3D "GEN_CMD", [57] =3D "SW_FUNC_RSVD", + [58] =3D "READ_EXTR_MULTI", [59] =3D "WRITE_EXTR_MULT= I", + [60] =3D "MANUF_RSVD", [61] =3D "MANUF_RSVD", + [62] =3D "MANUF_RSVD", [63] =3D "MANUF_RSVD", + }; + return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_CMD"; +} + static const sd_cmd_type_t sd_cmd_type[SD_CMD_MAX] =3D { sd_bc, sd_none, sd_bcr, sd_bcr, sd_none, sd_none, sd_none, sd_ac, sd_bcr, sd_ac, sd_ac, sd_adtc, sd_ac, sd_ac, sd_none, sd_ac, @@ -787,7 +826,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, uint32_t rca =3D 0x0000; uint64_t addr =3D (sd->ocr & (1 << 30)) ? (uint64_t) req.arg << 9 : re= q.arg; =20 - trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state)= ); + trace_sdcard_normal_command(req.cmd, req.arg, sd_state_name(sd->state), + sd_cmd_abbreviation(req.cmd)); =20 /* Not interpreting this as an app command */ sd->card_status &=3D ~APP_CMD; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 01f94c4b54..f3714a6dc5 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 c= har *mode) "%s -> %s (mode: %s)" -sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d= arg 0x%08x (state %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_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) "" --=20 2.15.1