From: Philippe Mathieu-Daudé <phi...@linaro.org>
Commit 1585ab9f1ba ("hw/sd/sdcard: Fill SPI response bits in card
code") exposed a bug in the SPI adapter: if no SD card is plugged,
we are returning "there is a card with an error". This is wrong,
we shouldn't return any particular packet response, but the noise
shifted on the MISO line. Return the dummy byte, otherwise we get:
qemu-system-riscv64: ../hw/sd/ssi-sd.c:160: ssi_sd_transfer: Assertion
`s->arglen > 0' failed.
Reported-by: Guenter Roeck <li...@roeck-us.net>
Fixes: 775616c3ae8 ("Partial SD card SPI mode support")
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Tested-by: Guenter Roeck <li...@roeck-us.net>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Reviewed-by: Gustavo Romero <gustavo.rom...@linaro.org>
Tested-by: Alex Bennée <alex.ben...@linaro.org>
Message-Id: <20250812140415.70153-2-phi...@linaro.org>
(cherry picked from commit e262646e12acd6c1132e03d57fea20680a503251)
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index c4a58da0ab..fbbcb5c750 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -106,6 +106,10 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev,
uint32_t val)
SDRequest request;
uint8_t longresp[16];
+ if (!sdbus_get_inserted(&s->sdbus)) {
+ return SSI_DUMMY;
+ }
+
/*
* Special case: allow CMD12 (STOP TRANSMISSION) while reading data.
*
--
2.47.2
