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 | 57 ++++++++++++++++++++++++++++--------------------------
> 1 file changed, 30 insertions(+), 27 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index e2a7ed8b45..4650d20ee7 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -242,7 +242,7 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> static const char *cmd_abbrev[SDMMC_CMD_MAX] = {
> [18] = "READ_MULTIPLE_BLOCK",
> [21] = "DPS_spec",
> - [24] = "WRITE_BLOCK", [25] = "WRITE_MULTIPLE_BLOCK",
> + [25] = "WRITE_MULTIPLE_BLOCK",
> [26] = "MANUF_RSVD", [27] = "PROGRAM_CSD",
> [28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT",
> [30] = "SEND_WRITE_PROT",
> @@ -1487,6 +1487,33 @@ static sd_rsp_type_t sd_cmd_SET_BLOCK_COUNT(SDState *sd, SDRequest req)
> return sd_r1;
> }
>
> +/* CMD24 */
> +static sd_rsp_type_t sd_cmd_WRITE_SINGLE_BLOCK(SDState *sd, SDRequest req)
> +{
> + uint64_t addr;
> +
> + 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, "WRITE_SINGLE_BLOCK", addr, sd->blk_len)) {
> + return sd_r1;
> + }
> +
> + if (sd->size <= SDSC_MAX_CAPACITY) {
> + if (sd_wp_addr(sd, addr)) {
> + sd->card_status |= WP_VIOLATION;
> + }
> + }
> + if (sd->csd[14] & 0x30) {
> + sd->card_status |= WP_VIOLATION;
> + }
> +
> + sd->blk_written = 0;
> + return sd_cmd_to_receivingdata(sd, req, addr, sd->blk_len);
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint16_t rca;
> @@ -1544,32 +1571,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> break;
>
> /* Block write commands (Class 4) */
> - case 24: /* CMD24: WRITE_SINGLE_BLOCK */
> - addr = sd_req_get_address(sd, req);
> - switch (sd->state) {
> - case sd_transfer_state:
> -
> - if (!address_in_range(sd, "WRITE_SINGLE_BLOCK", addr,
> - sd->blk_len)) {
> - return sd_r1;
> - }
> -
> - if (sd->size <= SDSC_MAX_CAPACITY) {
> - if (sd_wp_addr(sd, sd->data_start)) {
> - sd->card_status |= WP_VIOLATION;
> - }
> - }
> - if (sd->csd[14] & 0x30) {
> - sd->card_status |= WP_VIOLATION;
> - }
> - sd->blk_written = 0;
> - return sd_cmd_to_receivingdata(sd, req, addr, sd->blk_len);
> -
> - default:
> - break;
> - }
> - break;
> -
> case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */
> addr = sd_req_get_address(sd, req);
> switch (sd->state) {
> @@ -2308,6 +2309,7 @@ static const SDProto sd_proto_spi = {
> [13] = {0, sd_spi, "SEND_STATUS", sd_cmd_SEND_STATUS},
> [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN},
> [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK},
> + [24] = {4, sd_spi, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK},
> [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},
> @@ -2344,6 +2346,7 @@ static const SDProto sd_proto_sd = {
> [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
> [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
> [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
> + [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK},
> [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},