On 6/28/24 9:02 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 | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 7c6f5ccc72..0f9bab105e 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1520,6 +1520,12 @@ static sd_rsp_type_t sd_cmd_WRITE_SINGLE_BLOCK(SDState *sd, SDRequest req)
> return sd_cmd_to_receivingdata(sd, req, addr, sd->blk_len);
> }
>
> +/* CMD26 */
> +static sd_rsp_type_t mmc_cmd_PROGRAM_CID(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
> +}
> +
> /* CMD27 */
> static sd_rsp_type_t sd_cmd_PROGRAM_CSD(SDState *sd, SDRequest req)
> {
> @@ -1868,9 +1874,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> }
> break;
>
> - case 26: /* CMD26: PROGRAM_CID */
> - return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
> -
> default:
> qemu_log_mask(LOG_GUEST_ERROR, "SD: Unknown CMD%i\n", req.cmd);
> return sd_illegal;
> @@ -2429,6 +2432,7 @@ static const SDProto sd_proto_emmc = {
> [19] = {0, sd_adtc, "BUSTEST_W", sd_cmd_unimplemented},
> [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
> [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK},
> + [26] = {4, sd_adtc, "PROGRAM_CID", mmc_cmd_PROGRAM_CID},
> [27] = {4, sd_adtc, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD},
> [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT},
> [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT},