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 | 47 ++++++++++++++++++++++++-----------------------
> 1 file changed, 24 insertions(+), 23 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index bf9975e9b1..4e31dfe18f 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -244,7 +244,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> [21] = "DPS_spec",
> [25] = "WRITE_MULTIPLE_BLOCK",
> [26] = "MANUF_RSVD",
> - [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END",
> [38] = "ERASE",
> [40] = "DPS_spec",
> [42] = "LOCK_UNLOCK",
> @@ -1583,6 +1582,26 @@ static sd_rsp_type_t sd_cmd_SEND_WRITE_PROT(SDState *sd, SDRequest req)
> return sd_cmd_to_sendingdata(sd, req, addr, &data, sizeof(data));
> }
>
> +/* CMD32 */
> +static sd_rsp_type_t sd_cmd_ERASE_WR_BLK_START(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> + sd->erase_start = req.arg;
> + return sd_r1;
> +}
> +
> +/* CMD33 */
> +static sd_rsp_type_t sd_cmd_ERASE_WR_BLK_END(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> + sd->erase_end = req.arg;
> + return sd_r1;
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> @@ -1672,28 +1691,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
>
> /* Erase commands (Class 5) */
> - case 32: /* CMD32: ERASE_WR_BLK_START */
> - switch (sd->state) {
> - case sd_transfer_state:
> - sd->erase_start = req.arg;
> - return sd_r1;
> -
> - default:
> - break;
> - }
> - break;
> -
> - case 33: /* CMD33: ERASE_WR_BLK_END */
> - switch (sd->state) {
> - case sd_transfer_state:
> - sd->erase_end = req.arg;
> - return sd_r1;
> -
> - default:
> - break;
> - }
> - break;
> -
> case 38: /* CMD38: ERASE */
> switch (sd->state) {
> case sd_transfer_state:
> @@ -2315,6 +2312,8 @@ static const SDProto sd_proto_spi = {
> [28] = {6, sd_spi, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT},
> [29] = {6, sd_spi, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT},
> [30] = {6, sd_spi, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT},
> + [32] = {5, sd_spi, "ERASE_WR_BLK_START", sd_cmd_ERASE_WR_BLK_START},
> + [33] = {5, sd_spi, "ERASE_WR_BLK_END", sd_cmd_ERASE_WR_BLK_END},
> [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},
> @@ -2356,6 +2355,8 @@ static const SDProto sd_proto_sd = {
> [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT},
> [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT},
> [30] = {6, sd_adtc, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT},
> + [32] = {5, sd_ac, "ERASE_WR_BLK_START", sd_cmd_ERASE_WR_BLK_START},
> + [33] = {5, sd_ac, "ERASE_WR_BLK_END", sd_cmd_ERASE_WR_BLK_END},
> [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},