Skip to contentSkip to conversation

hw/sd: ssi-sd: Fix SEND_IF_COND (CMD8) response

PATCH In review Bin Meng 2 participants 2 messages Jan 26, 2021

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 hw/sd: ssi-sd: Fix SEND_IF_COND (CMD8) response

From: Bin Meng <[email protected]>

The SEND_IF_COND command (CMD8) response is of format R7, but current code returns R1 for CMD8. Fix it.

Fixes 775616c3ae8c ("Partial SD card SPI mode support")

---
When testing with VxWorks driver, this additional issue was exposed. It looks like VxWorks has stricter parsing on command responses while U-Boot/Linux drivers are all happy with exising QEMU CMD8 response.

Based on http://patchwork.ozlabs.org/project/qemu-devel/list/?series=226136

 hw/sd/ssi-sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
hw/sd/ssi-sd.c +3 -3
index 2d08ce4..71911ae 100644
@@ -178,9 +178,9 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)
                 s->arglen = 1;
                 s->response[0] = 4;
                 DPRINTF("SD command failed\n");
-            } else if (s->cmd == 58) {
-                /* CMD58 returns R3 response (OCR)  */
-                DPRINTF("Returned OCR\n");
+            } else if (s->cmd == 8 || s->cmd == 58) {
+                /* CMD8/CMD58 returns R3/R7 response */
+                DPRINTF("Returned R3/R7\n");
                 s->arglen = 5;
                 s->response[0] = 1;
                 memcpy(&s->response[1], longresp, 4);
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Bin Meng

From: Bin Meng <[email protected]>

The SEND_IF_COND command (CMD8) response is of format R7, but current code returns R1 for CMD8. Fix it.

Fixes 775616c3ae8c ("Partial SD card SPI mode support")

---
When testing with VxWorks driver, this additional issue was exposed. It looks like VxWorks has stricter parsing on command responses while U-Boot/Linux drivers are all happy with exising QEMU CMD8 response.

Quoted 4 lines

Based on http://patchwork.ozlabs.org/project/qemu-devel/list/?series=226136

 hw/sd/ssi-sd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)