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 | 38 ++++++++++++++++++++------------------> 1 file changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 564e08709b..1c092ab43c 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -240,7 +240,7 @@ 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] = {
> - [12] = "STOP_TRANSMISSION", [13] = "SEND_STATUS",
> + [13] = "SEND_STATUS",
> [15] = "GO_INACTIVE_STATE",
> [16] = "SET_BLOCKLEN", [17] = "READ_SINGLE_BLOCK",
> [18] = "READ_MULTIPLE_BLOCK",
> @@ -1360,6 +1360,23 @@ static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req)
> return sd_req_rca_same(sd, req) ? sd_r2_i : sd_r0;
> }
>
> +/* CMD12 */
> +static sd_rsp_type_t sd_cmd_STOP_TRANSMISSION(SDState *sd, SDRequest req)
> +{
> + switch (sd->state) {
> + case sd_sendingdata_state:
> + sd->state = sd_transfer_state;
> + return sd_r1b;
> + case sd_receivingdata_state:
> + sd->state = sd_programming_state;
> + /* Bzzzzzzztt .... Operation complete. */
> + sd->state = sd_transfer_state;
> + return sd_r1;
> + default:
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1426,23 +1443,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>
> switch (req.cmd) {
> /* Basic commands (Class 0 and Class 1) */
> - case 12: /* CMD12: STOP_TRANSMISSION */
> - switch (sd->state) {
> - case sd_sendingdata_state:
> - sd->state = sd_transfer_state;
> - return sd_r1b;
> -
> - case sd_receivingdata_state:
> - sd->state = sd_programming_state;
> - /* Bzzzzzzztt .... Operation complete. */
> - sd->state = sd_transfer_state;
> - return sd_r1b;
> -
> - default:
> - break;
> - }
> - break;
> -
> case 13: /* CMD13: SEND_STATUS */
> rca = sd_req_get_rca(sd, req);
> if (sd->mode != sd_data_transfer_mode) {
> @@ -2278,6 +2278,7 @@ static const SDProto sd_proto_spi = {
> [8] = {0, sd_spi, "SEND_IF_COND", sd_cmd_SEND_IF_COND},
> [9] = {0, sd_spi, "SEND_CSD", spi_cmd_SEND_CSD},
> [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID},
> + [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION},
> [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional},
> [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional},
> [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
> @@ -2306,6 +2307,7 @@ static const SDProto sd_proto_sd = {
> [9] = {0, sd_ac, "SEND_CSD", sd_cmd_SEND_CSD},
> [10] = {0, sd_ac, "SEND_CID", sd_cmd_SEND_CID},
> [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional},
> + [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION},
> [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},