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, 8 insertions(+), 5 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 17fec612eb..4d78ac5b59 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -245,7 +245,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> [25] = "WRITE_MULTIPLE_BLOCK",
> [26] = "MANUF_RSVD",
> [40] = "DPS_spec",
> - [42] = "LOCK_UNLOCK",
> [54] = "SDIO_RSVD", [55] = "APP_CMD",
> [56] = "GEN_CMD",
> [60] = "MANUF_RSVD", [61] = "MANUF_RSVD",
> @@ -1619,6 +1618,12 @@ static sd_rsp_type_t sd_cmd_ERASE(SDState *sd, SDRequest req)
> return sd_r1b;
> }
>
> +/* CMD42 */
> +static sd_rsp_type_t sd_cmd_LOCK_UNLOCK(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_to_receivingdata(sd, req, 0, 0);
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> @@ -1707,10 +1712,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));
>
> - /* Lock card commands (Class 7) */
> - case 42: /* CMD42: LOCK_UNLOCK */
> - return sd_cmd_to_receivingdata(sd, req, 0, 0);
> -
> /* Application specific commands (Class 8) */
> case 55: /* CMD55: APP_CMD */
> rca = sd_req_get_rca(sd, req);
> @@ -2316,6 +2317,7 @@ static const SDProto sd_proto_spi = {
> [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
> [37] = {10, sd_spi, "CONTROL_ASSD_SYSTEM", sd_cmd_optional},
> [38] = {5, sd_spi, "ERASE", sd_cmd_ERASE},
> + [42] = {7, sd_spi, "LOCK_UNLOCK", sd_cmd_LOCK_UNLOCK},
> [50] = {10, sd_spi, "DIRECT_SECURE_READ", sd_cmd_optional},
> [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional},
> [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional},
> @@ -2360,6 +2362,7 @@ static const SDProto sd_proto_sd = {
> [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
> [37] = {10, sd_ac, "CONTROL_ASSD_SYSTEM", sd_cmd_optional},
> [38] = {5, sd_ac, "ERASE", sd_cmd_ERASE},
> + [42] = {7, sd_adtc, "LOCK_UNLOCK", sd_cmd_LOCK_UNLOCK},
> [43] = {1, sd_ac, "Q_MANAGEMENT", sd_cmd_optional},
> [44] = {1, sd_ac, "Q_TASK_INFO_A", sd_cmd_optional},
> [45] = {1, sd_ac, "Q_TASK_INFO_B", sd_cmd_optional},