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 | 36 ++++++++++++++++++++++--------------
> 1 file changed, 22 insertions(+), 14 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index e2f7e99ea2..bd7c7cf518 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -240,8 +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] = {
> - [9] = "SEND_CSD",
> - [10] = "SEND_CID",
> [12] = "STOP_TRANSMISSION", [13] = "SEND_STATUS",
> [15] = "GO_INACTIVE_STATE",
> [16] = "SET_BLOCKLEN", [17] = "READ_SINGLE_BLOCK",
> @@ -1324,6 +1322,26 @@ static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req)
> return sd_r7;
> }
>
> +/* CMD9 */
> +static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_standby_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +
> + return sd_req_rca_same(sd, req) ? sd_r2_s : sd_r0;
> +}
> +
> +/* CMD10 */
> +static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_standby_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +
> + return sd_req_rca_same(sd, req) ? sd_r2_i : sd_r0;
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1393,12 +1411,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> case 9: /* CMD9: SEND_CSD */
> rca = sd_req_get_rca(sd, req);
> switch (sd->state) {
> - case sd_standby_state:
> - if (sd->rca != rca)
> - return sd_r0;
> -
> - return sd_r2_s;
> -
> case sd_transfer_state:
> if (!sd_is_spi(sd)) {
> break;
> @@ -1414,12 +1426,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> case 10: /* CMD10: SEND_CID */
> rca = sd_req_get_rca(sd, req);
> switch (sd->state) {
> - case sd_standby_state:
> - if (sd->rca != rca)
> - return sd_r0;
> -
> - return sd_r2_i;
> -
> case sd_transfer_state:
> if (!sd_is_spi(sd)) {
> break;
> @@ -2307,6 +2313,8 @@ static const SDProto sd_proto_sd = {
> [6] = {10, sd_adtc, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION},
> [7] = {0, sd_ac, "(DE)SELECT_CARD", sd_cmd_DE_SELECT_CARD},
> [8] = {0, sd_bcr, "SEND_IF_COND", sd_cmd_SEND_IF_COND},
> + [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},
> [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
> [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},