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 | 43 ++++++++++++++++++++++++-------------------
> 1 file changed, 24 insertions(+), 19 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 6ad98db981..e2f7e99ea2 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] = {
> - [8] = "SEND_IF_COND", [9] = "SEND_CSD",
> + [9] = "SEND_CSD",
> [10] = "SEND_CID",
> [12] = "STOP_TRANSMISSION", [13] = "SEND_STATUS",
> [15] = "GO_INACTIVE_STATE",
> @@ -1303,6 +1303,27 @@ static sd_rsp_type_t sd_cmd_DE_SELECT_CARD(SDState *sd, SDRequest req)
> return sd_invalid_state_for_cmd(sd, req);
> }
>
> +/* CMD8 */
> +static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req)
> +{
> + if (sd->spec_version < SD_PHY_SPECv2_00_VERS) {
> + return sd_cmd_illegal(sd, req);
> + }
> + if (sd->state != sd_idle_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> + sd->vhs = 0;
> +
> + /* No response if not exactly one VHS bit is set. */
> + if (!(req.arg >> 8) || (req.arg >> (ctz32(req.arg & ~0xff) + 1))) {
> + return sd_is_spi(sd) ? sd_r7 : sd_r0;
> + }
> +
> + /* Accept. */
> + sd->vhs = req.arg;
> + return sd_r7;
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1369,24 +1390,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>
> switch (req.cmd) {
> /* Basic commands (Class 0 and Class 1) */
> - case 8: /* CMD8: SEND_IF_COND */
> - if (sd->spec_version < SD_PHY_SPECv2_00_VERS) {
> - break;
> - }
> - if (sd->state != sd_idle_state) {
> - break;
> - }
> - sd->vhs = 0;
> -
> - /* No response if not exactly one VHS bit is set. */
> - if (!(req.arg >> 8) || (req.arg >> (ctz32(req.arg & ~0xff) + 1))) {
> - return sd_is_spi(sd) ? sd_r7 : sd_r0;
> - }
> -
> - /* Accept. */
> - sd->vhs = req.arg;
> - return sd_r7;
> -
> case 9: /* CMD9: SEND_CSD */
> rca = sd_req_get_rca(sd, req);
> switch (sd->state) {
> @@ -2278,6 +2281,7 @@ static const SDProto sd_proto_spi = {
> [1] = {0, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
> [5] = {9, sd_spi, "IO_SEND_OP_COND", sd_cmd_optional},
> [6] = {10, sd_spi, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION},
> + [8] = {0, sd_spi, "SEND_IF_COND", sd_cmd_SEND_IF_COND},
> [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},
> @@ -2302,6 +2306,7 @@ static const SDProto sd_proto_sd = {
> [5] = {9, sd_bc, "IO_SEND_OP_COND", sd_cmd_optional},
> [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},
> [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},