On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 37 +++++++++++++++++++++++++------------
> 1 file changed, 25 insertions(+), 12 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index bb80d11f87..d7ed8aee73 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
> static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> {
> static const char *cmd_abbrev[SDMMC_CMD_MAX] = {
> - [15] = "GO_INACTIVE_STATE",
> [16] = "SET_BLOCKLEN", [17] = "READ_SINGLE_BLOCK",
> [18] = "READ_MULTIPLE_BLOCK",
> [21] = "DPS_spec",
> @@ -1402,6 +1401,30 @@ static sd_rsp_type_t sd_cmd_SEND_STATUS(SDState *sd, SDRequest req)
> return sd_req_rca_same(sd, req) ? sd_r1 : sd_r0;
> }
>
> +/* CMD15 */
> +static sd_rsp_type_t sd_cmd_GO_INACTIVE_STATE(SDState *sd, SDRequest req)
> +{
> + if (sd->mode != sd_data_transfer_mode) {
> + return sd_invalid_mode_for_cmd(sd, req);
> + }
> + switch (sd->state) {
> + case sd_standby_state:
> + case sd_transfer_state:
> + case sd_sendingdata_state:
> + case sd_receivingdata_state:
> + case sd_programming_state:
> + case sd_disconnect_state:
> + break;
> + default:
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> + if (sd_req_rca_same(sd, req)) {
> + sd->state = sd_inactive_state;
> + }
> +
> + return sd_r0;
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1467,17 +1490,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> }
>
> switch (req.cmd) {
> - /* Basic commands (Class 0 and Class 1) */
> - case 15: /* CMD15: GO_INACTIVE_STATE */
> - if (sd->mode != sd_data_transfer_mode) {
> - return sd_invalid_mode_for_cmd(sd, req);
> - }
> - rca = sd_req_get_rca(sd, req);
> - if (sd->rca == rca) {
> - sd->state = sd_inactive_state;
> - }
> - return sd_r0;
> -
> /* Block read commands (Class 2) */
> case 16: /* CMD16: SET_BLOCKLEN */
> switch (sd->state) {
> @@ -2324,6 +2336,7 @@ static const SDProto sd_proto_sd = {
> [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional},
> [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION},
> [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS},
> + [15] = {0, sd_ac, "GO_INACTIVE_STATE", sd_cmd_GO_INACTIVE_STATE},
> [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
> [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
> [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},