diff mbox series

[PULL,29/32] sdcard: check the card is in correct state for APP CMD (CMD55)

Message ID 20180222152307.7499-30-peter.maydell@linaro.org
State Accepted
Commit d6911486550b794f879584821a0ec4d40e61a47b
Headers show
Series target-arm queue | expand

Commit Message

Peter Maydell Feb. 22, 2018, 3:23 p.m. UTC 
From: Philippe Mathieu-Daudé <f4bug@amsat.org>


Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

Message-id: 20180215221325.7611-14-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/sd/sd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

-- 
2.16.1
diff mbox series

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index ff7ace3491..d6dd2b9a15 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1386,6 +1386,14 @@  static sd_rsp_type_t sd_normal_command(SDState *sd,
 
     /* Application specific commands (Class 8) */
     case 55:	/* CMD55:  APP_CMD */
+        switch (sd->state) {
+        case sd_ready_state:
+        case sd_identification_state:
+        case sd_inactive_state:
+            return sd_illegal;
+        default:
+            break;
+        }
         if (!sd->spi) {
             if (sd->rca != rca) {
                 return sd_r0;