mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/sdcard: Simplify sd_inactive_state handling

Browse Source 
Card entering sd_inactive_state powers off, and won't respond
anymore. Handle that once when entering sd_do_command().

Remove condition always true in sd_cmd_GO_IDLE_STATE().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-12-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-25 05:50:16 +02:00
parent 26be1ceee5
commit 257e36c9e6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/sd/sd.c
View File

@ -1078,10 +1078,8 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
/* CMD0 */ /* CMD0 */
static sd_rsp_type_t sd_cmd_GO_IDLE_STATE(SDState *sd, SDRequest req) 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->state = sd_idle_state; sd_reset(DEVICE(sd));
sd_reset(DEVICE(sd));
}
return sd_is_spi(sd) ? sd_r1 : sd_r0; return sd_is_spi(sd) ? sd_r1 : sd_r0;
} }
@ -1580,7 +1578,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
switch (sd->state) { switch (sd->state) {
case sd_ready_state: case sd_ready_state:
case sd_identification_state: case sd_identification_state:
case sd_inactive_state:
return sd_illegal; return sd_illegal;
case sd_idle_state: case sd_idle_state:
if (rca) { if (rca) {
@ -1801,6 +1798,11 @@ int sd_do_command(SDState *sd, SDRequest *req,
return 0; return 0;
} }
if (sd->state == sd_inactive_state) {
rtype = sd_illegal;
goto send_response;
}
if (sd_req_crc_validate(req)) { if (sd_req_crc_validate(req)) {
sd->card_status |= COM_CRC_ERROR; sd->card_status |= COM_CRC_ERROR;
rtype = sd_illegal; rtype = sd_illegal;