[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler
From: |
Cédric Le Goater |
Subject: |
[RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler |
Date: |
Fri, 18 Mar 2022 14:28:13 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20210624142209.1193073-8-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/sd/sd.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index fd32aeb7fe82..30429e8954d3 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1000,6 +1000,16 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd,
SDRequest req)
return sd_illegal;
}
+static sd_rsp_type_t sd_cmd_GO_IDLE_STATE(SDState *sd, SDRequest req)
+{
+ if (sd->state != sd_inactive_state) {
+ sd->state = sd_idle_state;
+ sd_reset(DEVICE(sd));
+ }
+
+ return sd->spi ? sd_r1 : sd_r0;
+}
+
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{
uint32_t rca = 0x0000;
@@ -1039,18 +1049,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
switch (req.cmd) {
/* Basic commands (Class 0 and Class 1) */
- case 0: /* CMD0: GO_IDLE_STATE */
- switch (sd->state) {
- case sd_inactive_state:
- return sd->spi ? sd_r1 : sd_r0;
-
- default:
- sd->state = sd_idle_state;
- sd_reset(DEVICE(sd));
- return sd->spi ? sd_r1 : sd_r0;
- }
- break;
-
case 1: /* CMD1: SEND_OP_CMD */
sd->state = sd_transfer_state;
return sd_r1;
@@ -2112,6 +2110,7 @@ void sd_enable(SDState *sd, bool enable)
static const SDProto sd_proto_spi = {
.name = "SPI",
.cmd = {
+ [0] = sd_cmd_GO_IDLE_STATE,
[2 ... 4] = sd_cmd_illegal,
[5] = sd_cmd_illegal,
[7] = sd_cmd_illegal,
@@ -2127,6 +2126,7 @@ static const SDProto sd_proto_spi = {
static const SDProto sd_proto_sd = {
.name = "SD",
.cmd = {
+ [0] = sd_cmd_GO_IDLE_STATE,
[1] = sd_cmd_illegal,
[5] = sd_cmd_illegal,
[52 ... 54] = sd_cmd_illegal,
--
2.34.1
- [RFC PATCH 00/17] hw/sd: Rework models for eMMC support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 02/17] hw/sd: Move proto_name to SDProto structure, Cédric Le Goater, 2022/03/18
- [RFC PATCH 01/17] hw/sd: When card is in wrong state, log which state it is, Cédric Le Goater, 2022/03/18
- [RFC PATCH 12/17] hw/sd: Fix SET_BLOCK_COUNT command argument, Cédric Le Goater, 2022/03/18
- [RFC PATCH 17/17] hw/sd: Subtract bootarea size from blk, Cédric Le Goater, 2022/03/18
- [RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler,
Cédric Le Goater <=
- [RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 14/17] hw/sd: Add CMD21 tuning sequence, Cédric Le Goater, 2022/03/18
- [RFC PATCH 05/17] hw/sd: Add sd_cmd_unimplemented() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 13/17] hw/sd: Update CMD1 definition for MMC, Cédric Le Goater, 2022/03/18
- [RFC PATCH 11/17] hw/sd: Add eMMC support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 07/17] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 10/17] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type, Cédric Le Goater, 2022/03/18