SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/sd/sdcard: Restrict SWITCH_FUNCTION to sd_transfer_state (CMD6)

Browse Source 
SWITCH_FUNCTION is only allowed in TRANSFER state
(See 4.8 "Card State Transition Table).

Fixes: a1bb27b1e9 ("Initial SD card emulation")
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-13-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-25 04:48:12 +02:00
parent 2ec83d679e
commit c239084f5b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/sd/sd.c
View File

@ -1204,6 +1204,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
if (sd->mode != sd_data_transfer_mode) { if (sd->mode != sd_data_transfer_mode) {
return sd_invalid_mode_for_cmd(sd, req); return sd_invalid_mode_for_cmd(sd, req);
} }
if (sd->state != sd_transfer_state) {
return sd_invalid_state_for_cmd(sd, req);
}
sd_function_switch(sd, req.arg); sd_function_switch(sd, req.arg);
sd->state = sd_sendingdata_state; sd->state = sd_sendingdata_state;
sd->data_start = 0; sd->data_start = 0;