qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Cédric Le Goater" <clg@redhat.com>,
	"Andrew Jeffery" <andrew@codeconstruct.com.au>
Subject: [PULL 14/16] hw/sd/sdcard: Cover more SDCardStates
Date: Sat,  6 Jul 2024 00:04:32 +0200	[thread overview]
Message-ID: <20240705220435.15415-15-philmd@linaro.org> (raw)
In-Reply-To: <20240705220435.15415-1-philmd@linaro.org>

So far eMMC will only use sd_sleep_state, but
all all states specified for completeness.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-81-philmd@linaro.org>
---
 hw/sd/sd.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 9e6b9c9c63..ecb1b2f405 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -76,7 +76,9 @@ enum SDCardModes {
 };
 
 enum SDCardStates {
+    sd_waitirq_state        = -2, /* emmc */
     sd_inactive_state       = -1,
+
     sd_idle_state           = 0,
     sd_ready_state          = 1,
     sd_identification_state = 2,
@@ -86,6 +88,9 @@ enum SDCardStates {
     sd_receivingdata_state  = 6,
     sd_programming_state    = 7,
     sd_disconnect_state     = 8,
+    sd_bus_test_state       = 9,  /* emmc */
+    sd_sleep_state          = 10, /* emmc */
+    sd_io_state             = 15  /* sd */
 };
 
 #define SDMMC_CMD_MAX 64
@@ -203,13 +208,19 @@ static const char *sd_state_name(enum SDCardStates state)
         [sd_standby_state]          = "standby",
         [sd_transfer_state]         = "transfer",
         [sd_sendingdata_state]      = "sendingdata",
+        [sd_bus_test_state]         = "bus-test",
         [sd_receivingdata_state]    = "receivingdata",
         [sd_programming_state]      = "programming",
         [sd_disconnect_state]       = "disconnect",
+        [sd_sleep_state]            = "sleep",
+        [sd_io_state]               = "i/o"
     };
     if (state == sd_inactive_state) {
         return "inactive";
     }
+    if (state == sd_waitirq_state) {
+        return "wait-irq";
+    }
     assert(state < ARRAY_SIZE(state_name));
     return state_name[state];
 }
-- 
2.41.0



  parent reply	other threads:[~2024-07-05 22:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-05 22:04 [PULL 00/16] SD/MMC patches for 2024-07-06 Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 01/16] hw/sd/sdhci: Log non-sequencial access as GUEST_ERROR Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 02/16] hw/sd/npcm7xx_sdhci: Use TYPE_SYSBUS_SDHCI definition Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 03/16] tests/qtest/npcm7xx_sdhci: Access the card using its published address Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 04/16] hw/sd/sdcard: Generate random RCA value Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 05/16] hw/sd/sdcard: Remove leftover comment about removed 'spi' Property Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 06/16] hw/sd/sdcard: Use spec v3.01 by default Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 07/16] hw/sd/sdcard: Rename sd_cmd_SEND_OP_COND handler Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 08/16] hw/sd/sdcard: Add sd_cmd_GEN_CMD handler (CMD56) Philippe Mathieu-Daudé
2024-07-12 13:50   ` Peter Maydell
2024-07-05 22:04 ` [PULL 09/16] hw/sd/sdcard: Remove sd_none enum from sd_cmd_type_t Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 10/16] hw/sd/sdcard: Remove noise from sd_acmd_name() Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 11/16] hw/sd/sdcard: Remove noise from sd_cmd_name() Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 12/16] hw/sd/sdcard: Remove default case in read/write on DAT lines Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 13/16] hw/sd/sdcard: Trace length of data read " Philippe Mathieu-Daudé
2024-07-05 22:04 ` Philippe Mathieu-Daudé [this message]
2024-07-05 22:04 ` [PULL 15/16] hw/sd/sdcard: Introduce set_csd/set_cid handlers Philippe Mathieu-Daudé
2024-07-05 22:04 ` [PULL 16/16] hw/sd/sdcard: Extract TYPE_SDMMC_COMMON from TYPE_SD_CARD Philippe Mathieu-Daudé
2024-07-07 20:22 ` [PULL 00/16] SD/MMC patches for 2024-07-06 Richard Henderson

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=20240705220435.15415-15-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=andrew@codeconstruct.com.au \
    --cc=clg@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).