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, 19 insertions(+), 18 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index d7ed8aee73..d731c3df58 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -240,7 +240,7 @@ 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] = {
> - [16] = "SET_BLOCKLEN", [17] = "READ_SINGLE_BLOCK",
> + [17] = "READ_SINGLE_BLOCK",
> [18] = "READ_MULTIPLE_BLOCK",
> [21] = "DPS_spec",
> [24] = "WRITE_BLOCK", [25] = "WRITE_MULTIPLE_BLOCK",
> @@ -1425,6 +1425,22 @@ static sd_rsp_type_t sd_cmd_GO_INACTIVE_STATE(SDState *sd, SDRequest req)
> return sd_r0;
> }
>
> +/* CMD16 */
> +static sd_rsp_type_t sd_cmd_SET_BLOCKLEN(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> + if (req.arg > (1 << HWBLOCK_SHIFT)) {
> + sd->card_status |= BLOCK_LEN_ERROR;
> + } else {
> + trace_sdcard_set_blocklen(req.arg);
> + sd->blk_len = req.arg;
> + }
> +
> + return sd_r1;
> +}
> +
> /* CMD19 */
> static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> {
> @@ -1491,23 +1507,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
>
> switch (req.cmd) {
> /* Block read commands (Class 2) */
> - case 16: /* CMD16: SET_BLOCKLEN */
> - switch (sd->state) {
> - case sd_transfer_state:
> - if (req.arg > (1 << HWBLOCK_SHIFT)) {
> - sd->card_status |= BLOCK_LEN_ERROR;
> - } else {
> - trace_sdcard_set_blocklen(req.arg);
> - sd->blk_len = req.arg;
> - }
> -
> - return sd_r1;
> -
> - default:
> - break;
> - }
> - break;
> -
> case 17: /* CMD17: READ_SINGLE_BLOCK */
> addr = sd_req_get_address(sd, req);
> switch (sd->state) {
> @@ -2306,6 +2305,7 @@ static const SDProto sd_proto_spi = {
> [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID},
> [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},
> [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},
> @@ -2337,6 +2337,7 @@ static const SDProto sd_proto_sd = {
> [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION},
> [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},
> [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},