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 | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index a27a7e0f24..6a9d611429 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -263,7 +263,6 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
> [14] = "DPS_spec", [15] = "DPS_spec",
> [16] = "DPS_spec",
> [18] = "SECU_spec",
> - [51] = "SEND_SCR",
> [52] = "SECU_spec", [53] = "SECU_spec",
> [54] = "SECU_spec",
> [56] = "SECU_spec", [57] = "SECU_spec",
> @@ -1758,6 +1757,12 @@ static sd_rsp_type_t sd_acmd_SET_CLR_CARD_DETECT(SDState *sd, SDRequest req)
> return sd_r1;
> }
>
> +/* ACMD51 */
> +static sd_rsp_type_t sd_acmd_SEND_SCR(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_to_sendingdata(sd, req, 0, sd->scr, sizeof(sd->scr));
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint64_t addr;
> @@ -1866,16 +1871,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
> }
>
> switch (req.cmd) {
> - case 51: /* ACMD51: SEND_SCR */
> - switch (sd->state) {
> - case sd_transfer_state:
> - return sd_cmd_to_sendingdata(sd, req, 0, sd->scr, sizeof(sd->scr));
> -
> - default:
> - break;
> - }
> - break;
> -
> case 18: /* Reserved for SD security applications */
> case 25:
> case 26:
> @@ -2327,6 +2322,7 @@ static const SDProto sd_proto_spi = {
> [23] = {8, sd_spi, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT},
> [41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
> [42] = {8, sd_spi, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT},
> + [51] = {8, sd_spi, "SEND_SCR", sd_acmd_SEND_SCR},
> },
> };
>
> @@ -2388,6 +2384,7 @@ static const SDProto sd_proto_sd = {
> [23] = {8, sd_ac, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT},
> [41] = {8, sd_bcr, "SD_APP_OP_COND", sd_acmd_SD_APP_OP_COND},
> [42] = {8, sd_ac, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT},
> + [51] = {8, sd_adtc, "SEND_SCR", sd_acmd_SEND_SCR},
> },
> };
>