From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 31 Jul 2025 09:17:52 +0000 (+0200)
Subject: hw/sd/sdcard: Allow using SWITCH_FUNCTION in more SPI states
X-Git-Tag: v10.1.0-rc2~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c7bde41a37546a49e10adafc54e9201ac087585;p=thirdparty%2Fqemu.git

hw/sd/sdcard: Allow using SWITCH_FUNCTION in more SPI states

In SPI mode, SWITCH_FUNCTION is valid in all mode
(except the IDLE one).

Fixes: 775616c3ae8 ("Partial SD card SPI mode support")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250804133406.17456-8-philmd@linaro.org>
---

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index df2a272c6a..a9efa15859 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1488,8 +1488,14 @@ static sd_rsp_type_t sd_cmd_SWITCH_FUNCTION(SDState *sd, SDRequest req)
     if (sd->mode != sd_data_transfer_mode) {
         return sd_invalid_mode_for_cmd(sd, req);
     }
-    if (sd->state != sd_transfer_state) {
-        return sd_invalid_state_for_cmd(sd, req);
+    if (sd_is_spi(sd)) {
+        if (sd->state == sd_idle_state) {
+            return sd_invalid_state_for_cmd(sd, req);
+        }
+    } else {
+        if (sd->state != sd_transfer_state) {
+            return sd_invalid_state_for_cmd(sd, req);
+        }
     }
 
     sd_function_switch(sd, req.arg);