On 6/28/24 9:00 AM, Philippe Mathieu-Daudé wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 48 +++++++++++++++++++-----------------------------
> 1 file changed, 19 insertions(+), 29 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 605269163d..eece33194a 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -568,6 +568,21 @@ static void sd_set_sdstatus(SDState *sd)
> memset(sd->sd_status, 0, 64);
> }
>
> +static const uint8_t sd_tuning_block_pattern4[64] = {
> + /*
> + * See: Physical Layer Simplified Specification Version 3.01,
> + * Table 4-2.
> + */
> + 0xff, 0x0f, 0xff, 0x00, 0x0f, 0xfc, 0xc3, 0xcc,
> + 0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
> + 0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
> + 0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
> + 0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
> + 0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
> + 0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
> + 0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde
> +};
> +
> static int sd_req_crc_validate(SDRequest *req)
> {
> uint8_t buffer[5];
> @@ -1161,14 +1176,9 @@ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
> return sd_cmd_illegal(sd, req);
> }
>
> - if (sd->state != sd_transfer_state) {
> - return sd_invalid_state_for_cmd(sd, req);
> - }
> -
> - sd->state = sd_sendingdata_state;
> - sd->data_offset = 0;
> -
> - return sd_r1;
> + return sd_cmd_to_sendingdata(sd, req, 0,
> + sd_tuning_block_pattern4,
> + sizeof(sd_tuning_block_pattern4));
> }
>
> /* CMD23 */
> @@ -2100,20 +2110,6 @@ void sd_write_byte(SDState *sd, uint8_t value)
> }
> }
>
> -#define SD_TUNING_BLOCK_SIZE 64
> -
> -static const uint8_t sd_tuning_block_pattern[SD_TUNING_BLOCK_SIZE] = {
> - /* See: Physical Layer Simplified Specification Version 3.01, Table 4-2 */
> - 0xff, 0x0f, 0xff, 0x00, 0x0f, 0xfc, 0xc3, 0xcc,
> - 0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
> - 0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
> - 0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
> - 0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
> - 0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
> - 0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
> - 0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
> -};
> -
> uint8_t sd_read_byte(SDState *sd)
> {
> /* TODO: Append CRCs */
> @@ -2142,6 +2138,7 @@ uint8_t sd_read_byte(SDState *sd)
> case 9: /* CMD9: SEND_CSD */
> case 10: /* CMD10: SEND_CID */
> case 17: /* CMD17: READ_SINGLE_BLOCK */
> + case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
> sd_generic_read_byte(sd, &ret);
> break;
>
> @@ -2176,13 +2173,6 @@ uint8_t sd_read_byte(SDState *sd)
> }
> break;
>
> - case 19: /* CMD19: SEND_TUNING_BLOCK (SD) */
> - if (sd->data_offset >= SD_TUNING_BLOCK_SIZE - 1) {
> - sd->state = sd_transfer_state;
> - }
> - ret = sd_tuning_block_pattern[sd->data_offset++];
> - break;
> -
> case 22: /* ACMD22: SEND_NUM_WR_BLOCKS */
> ret = sd->data[sd->data_offset ++];
>