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, 25 insertions(+), 22 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index a63213613b..bf9975e9b1 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",
> - [30] = "SEND_WRITE_PROT",
> [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END",
> [38] = "ERASE",
> [40] = "DPS_spec",
> @@ -1561,11 +1560,33 @@ static sd_rsp_type_t sd_cmd_CLR_WRITE_PROT(SDState *sd, SDRequest req)
> return sd_cmd_SET_CLR_WRITE_PROT(sd, req, false);
> }
>
> +/* CMD30 */
> +static sd_rsp_type_t sd_cmd_SEND_WRITE_PROT(SDState *sd, SDRequest req)
> +{
> + uint64_t addr;
> + uint32_t data;
> +
> + if (sd->size > SDSC_MAX_CAPACITY) {
> + return sd_illegal;
> + }
> +
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +
> + addr = sd_req_get_address(sd, req);
> + if (!address_in_range(sd, "SEND_WRITE_PROT", addr, sd->blk_len)) {
> + return sd_r1;
> + }
> +
> + data = sd_wpbits(sd, req.arg);
> + return sd_cmd_to_sendingdata(sd, req, addr, &data, sizeof(data));
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> uint64_t addr;
> - uint32_t data;
>
> sd->last_cmd_name = sd_cmd_name(sd, req.cmd);
> /* CMD55 precedes an ACMD, so we are not interested in tracing it.
> @@ -1650,26 +1671,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));
>
> - /* Write protection (Class 6) */
> - case 30: /* CMD30: SEND_WRITE_PROT */
> - if (sd->size > SDSC_MAX_CAPACITY) {
> - return sd_illegal;
> - }
> - addr = sd_req_get_address(sd, req);
> - switch (sd->state) {
> - case sd_transfer_state:
> - if (!address_in_range(sd, "SEND_WRITE_PROT",
> - req.arg, sd->blk_len)) {
> - return sd_r1;
> - }
> - data = sd_wpbits(sd, req.arg);
> - return sd_cmd_to_sendingdata(sd, req, addr, &data, sizeof(data));
> -
> - default:
> - break;
> - }
> - break;
> -
> /* Erase commands (Class 5) */
> case 32: /* CMD32: ERASE_WR_BLK_START */
> switch (sd->state) {
> @@ -2313,6 +2314,7 @@ static const SDProto sd_proto_spi = {
> [27] = {4, sd_spi, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD},
> [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},
> [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},
> @@ -2353,6 +2355,7 @@ static const SDProto sd_proto_sd = {
> [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},
> + [30] = {6, sd_adtc, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT},
> [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},