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 | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 4650d20ee7..9d33113f11 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -243,7 +243,7 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> [18] = "READ_MULTIPLE_BLOCK",
> [21] = "DPS_spec",
> [25] = "WRITE_MULTIPLE_BLOCK",
> - [26] = "MANUF_RSVD", [27] = "PROGRAM_CSD",
> + [26] = "MANUF_RSVD",
> [28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT",
> [30] = "SEND_WRITE_PROT",
> [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END",
> @@ -1514,6 +1514,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);
> }
>
> +/* CMD27 */
> +static sd_rsp_type_t sd_cmd_PROGRAM_CSD(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->csd));
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> @@ -1603,9 +1609,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> case 26: /* CMD26: PROGRAM_CID */
> return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
>
> - case 27: /* CMD27: PROGRAM_CSD */
> - return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->csd));
> -
> /* Write protection (Class 6) */
> case 28: /* CMD28: SET_WRITE_PROT */
> if (sd->size > SDSC_MAX_CAPACITY) {
> @@ -2310,6 +2313,7 @@ static const SDProto sd_proto_spi = {
> [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN},
> [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK},
> [24] = {4, sd_spi, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK},
> + [27] = {4, sd_spi, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD},
> [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},
> @@ -2347,6 +2351,7 @@ static const SDProto sd_proto_sd = {
> [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
> [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
> [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK},
> + [27] = {4, sd_adtc, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD},
> [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional},
> [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional},
> [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},