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 | 37 ++++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index d731c3df58..e2a7ed8b45 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
> static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> {
> static const char *cmd_abbrev[SDMMC_CMD_MAX] = {
> - [17] = "READ_SINGLE_BLOCK",
> [18] = "READ_MULTIPLE_BLOCK",
> [21] = "DPS_spec",
> [24] = "WRITE_BLOCK", [25] = "WRITE_MULTIPLE_BLOCK",
> @@ -1441,6 +1440,24 @@ static sd_rsp_type_t sd_cmd_SET_BLOCKLEN(SDState *sd, SDRequest req)
> return sd_r1;
> }
>
> +/* CMD17 */
> +static sd_rsp_type_t sd_cmd_READ_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, "READ_SINGLE_BLOCK", addr, sd->blk_len)) {
> + return sd_r1;
> + }
> +
> + sd_blk_read(sd, addr, sd->blk_len);
> + return sd_cmd_to_sendingdata(sd, req, addr, NULL, sd->blk_len);
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1507,22 +1524,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>
> switch (req.cmd) {
> /* Block read commands (Class 2) */
> - case 17: /* CMD17: READ_SINGLE_BLOCK */
> - addr = sd_req_get_address(sd, req);
> - switch (sd->state) {
> - case sd_transfer_state:
> -
> - if (!address_in_range(sd, "READ_SINGLE_BLOCK", addr, sd->blk_len)) {
> - return sd_r1;
> - }
> - sd_blk_read(sd, addr, sd->blk_len);
> - return sd_cmd_to_sendingdata(sd, req, addr, NULL, sd->blk_len);
> -
> - default:
> - break;
> - }
> - break;
> -
> case 18: /* CMD18: READ_MULTIPLE_BLOCK */
> addr = sd_req_get_address(sd, req);
> switch (sd->state) {
> @@ -2306,6 +2307,7 @@ static const SDProto sd_proto_spi = {
> [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION},
> [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},
> [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},
> @@ -2338,6 +2340,7 @@ static const SDProto sd_proto_sd = {
> [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS},
> [15] = {0, sd_ac, "GO_INACTIVE_STATE", sd_cmd_GO_INACTIVE_STATE},
> [16] = {2, sd_ac, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN},
> + [17] = {2, sd_adtc, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK},
> [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},