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 | 91 +++++++++++++++++++++++++++---------------------------
> 1 file changed, 46 insertions(+), 45 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 9d33113f11..a63213613b 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",
> - [28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT",
> [30] = "SEND_WRITE_PROT",
> [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END",
> [38] = "ERASE",
> @@ -1520,6 +1519,48 @@ 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_cmd_SET_CLR_WRITE_PROT(SDState *sd, SDRequest req,
> + bool is_write)
> +{
> + uint64_t addr;
> +
> + 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, is_write ? "SET_WRITE_PROT" : "CLR_WRITE_PROT",
> + addr, 1)) {
> + return sd_r1b;
> + }
> +
> + sd->state = sd_programming_state;
> + if (is_write) {
> + set_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap);
> + } else {
> + clear_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap);
> + }
> + /* Bzzzzzzztt .... Operation complete. */
> + sd->state = sd_transfer_state;
> + return sd_r1;
> +}
> +
> +/* CMD28 */
> +static sd_rsp_type_t sd_cmd_SET_WRITE_PROT(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_SET_CLR_WRITE_PROT(sd, req, true);
> +}
> +
> +/* CMD29 */
> +static sd_rsp_type_t sd_cmd_CLR_WRITE_PROT(SDState *sd, SDRequest req)
> +{
> + return sd_cmd_SET_CLR_WRITE_PROT(sd, req, false);
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> @@ -1610,50 +1651,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
>
> /* Write protection (Class 6) */
> - case 28: /* CMD28: SET_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, "SET_WRITE_PROT", addr, 1)) {
> - return sd_r1b;
> - }
> -
> - sd->state = sd_programming_state;
> - set_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap);
> - /* Bzzzzzzztt .... Operation complete. */
> - sd->state = sd_transfer_state;
> - return sd_r1b;
> -
> - default:
> - break;
> - }
> - break;
> -
> - case 29: /* CMD29: CLR_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, "CLR_WRITE_PROT", addr, 1)) {
> - return sd_r1b;
> - }
> -
> - sd->state = sd_programming_state;
> - clear_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap);
> - /* Bzzzzzzztt .... Operation complete. */
> - sd->state = sd_transfer_state;
> - return sd_r1b;
> -
> - default:
> - break;
> - }
> - break;
> -
> case 30: /* CMD30: SEND_WRITE_PROT */
> if (sd->size > SDSC_MAX_CAPACITY) {
> return sd_illegal;
> @@ -2314,6 +2311,8 @@ static const SDProto sd_proto_spi = {
> [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},
> + [28] = {6, sd_spi, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT},
> + [29] = {6, sd_spi, "CLR_WRITE_PROT", sd_cmd_CLR_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},
> @@ -2352,6 +2351,8 @@ static const SDProto sd_proto_sd = {
> [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},
> + [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT},
> + [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_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},