From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Cédric Le Goater" <clg@kaod.org>,
"Bin Meng" <bin.meng@windriver.com>,
qemu-block@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Sai Pavan Boddu" <sai.pavan.boddu@xilinx.com>
Subject: [PATCH v2 03/25] hw/sd: When card is in wrong state, log which spec version is used
Date: Mon, 30 May 2022 21:37:54 +0200 [thread overview]
Message-ID: <20220530193816.45841-4-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220530193816.45841-1-philippe.mathieu.daude@gmail.com>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Add the sd_version_str() helper.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index b0e7a7e6d0..b3e61b9f84 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -145,6 +145,19 @@ struct SDState {
static void sd_realize(DeviceState *dev, Error **errp);
+static const char *sd_version_str(enum SDPhySpecificationVersion version)
+{
+ static const char *sdphy_version[] = {
+ [SD_PHY_SPECv1_10_VERS] = "v1.10",
+ [SD_PHY_SPECv2_00_VERS] = "v2.00",
+ [SD_PHY_SPECv3_01_VERS] = "v3.01",
+ };
+ if (version >= ARRAY_SIZE(sdphy_version)) {
+ return "unsupported version";
+ }
+ return sdphy_version[version];
+}
+
static const char *sd_state_name(enum SDCardStates state)
{
static const char *state_name[] = {
@@ -968,8 +981,9 @@ static bool address_in_range(SDState *sd, const char *desc,
static sd_rsp_type_t sd_invalid_state_for_cmd(SDState *sd, SDRequest req)
{
- qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state: %s\n",
- req.cmd, sd_state_name(sd->state));
+ qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state: %s (spec %s)\n",
+ req.cmd, sd_state_name(sd->state),
+ sd_version_str(sd->spec_version));
return sd_illegal;
}
--
2.36.1
next prev parent reply other threads:[~2022-05-30 19:41 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-30 19:37 [PATCH v2 00/25] hw/sd: Rework models for eMMC support Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 01/25] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01 Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 02/25] hw/sd: When card is in wrong state, log which state it is Philippe Mathieu-Daudé
2022-05-30 19:37 ` Philippe Mathieu-Daudé [this message]
2022-05-31 8:01 ` [PATCH v2 03/25] hw/sd: When card is in wrong state, log which spec version is used Cédric Le Goater
2022-05-30 19:37 ` [PATCH v2 04/25] hw/sd: Move proto_name to SDProto structure Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 06/25] hw/sd: Add sd_cmd_illegal() handler Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 08/25] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 09/25] hw/sd: Add sd_cmd_SEND_OP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 10/25] hw/sd: Add sd_cmd_ALL_SEND_CID() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 11/25] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 12/25] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 13/25] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler Philippe Mathieu-Daudé
2022-05-31 8:02 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 14/25] hw/sd: Basis for eMMC support Philippe Mathieu-Daudé
2022-05-31 7:54 ` Philippe Mathieu-Daudé via
2022-05-31 8:50 ` Cédric Le Goater
2022-05-31 9:05 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 15/25] hw/sd: Add sd_emmc_cmd_SEND_OP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 16/25] hw/sd: Add sd_emmc_cmd_ALL_SEND_CID() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 17/25] hw/sd: Add sd_emmc_cmd_SEND_RELATIVE_ADDR() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 18/25] hw/sd: Add sd_emmc_cmd_APP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 19/25] hw/sd: add sd_emmc_cmd_SEND_TUNING_BLOCK() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 20/25] hw/sd: Add CMD21 tuning sequence Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 21/25] hw/sd: Add mmc switch function support Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 22/25] hw/sd: Add sd_emmc_cmd_SEND_EXT_CSD() handler Philippe Mathieu-Daudé
2022-05-31 8:48 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 23/25] hw/sd: Support boot area in emmc image Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 24/25] hw/sd: Subtract bootarea size from blk Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 25/25] hw/sd: Add boot config support Philippe Mathieu-Daudé
2022-05-31 6:31 ` [PATCH v2 00/25] hw/sd: Rework models for eMMC support Cédric Le Goater
2022-05-31 7:56 ` Philippe Mathieu-Daudé via
2022-05-31 7:58 ` Philippe Mathieu-Daudé via
2022-05-31 9:19 ` Cédric Le Goater
2022-05-31 19:07 ` Philippe Mathieu-Daudé via
2022-06-01 5:50 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220530193816.45841-4-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=f4bug@amsat.org \
--cc=joel@jms.id.au \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sai.pavan.boddu@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).