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 | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 167e1c517a..a27a7e0f24 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",
> - [42] = "SET_CLR_CARD_DETECT",
> [51] = "SEND_SCR",
> [52] = "SECU_spec", [53] = "SECU_spec",
> [54] = "SECU_spec",
> @@ -1748,6 +1747,17 @@ static sd_rsp_type_t sd_acmd_SD_APP_OP_COND(SDState *sd, SDRequest req)
> return sd_r3;
> }
>
> +/* ACMD42 */
> +static sd_rsp_type_t sd_acmd_SET_CLR_CARD_DETECT(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +
> + /* Bringing in the 50KOhm pull-up resistor... Done. */
> + return sd_r1;
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint64_t addr;
> @@ -1856,17 +1866,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
> }
>
> switch (req.cmd) {
> - case 42: /* ACMD42: SET_CLR_CARD_DETECT */
> - switch (sd->state) {
> - case sd_transfer_state:
> - /* Bringing in the 50KOhm pull-up resistor... Done. */
> - return sd_r1;
> -
> - default:
> - break;
> - }
> - break;
> -
> case 51: /* ACMD51: SEND_SCR */
> switch (sd->state) {
> case sd_transfer_state:
> @@ -2327,6 +2326,7 @@ static const SDProto sd_proto_spi = {
> [22] = {8, sd_spi, "SEND_NUM_WR_BLOCKS", sd_acmd_SEND_NUM_WR_BLOCKS},
> [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},
> },
> };
>
> @@ -2387,6 +2387,7 @@ static const SDProto sd_proto_sd = {
> [22] = {8, sd_adtc, "SEND_NUM_WR_BLOCKS", sd_acmd_SEND_NUM_WR_BLOCKS},
> [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},
> },
> };
>