On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> Some commands expect less than BLOCK_LENGTH.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 4 ++--
> hw/sd/trace-events | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 64621d4340..a0da06e017 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -2197,8 +2197,8 @@ uint8_t sd_read_byte(SDState *sd)
> io_len = sd_blk_len(sd);
>
> trace_sdcard_read_data(sd->proto->name,
> - sd->last_cmd_name,
> - sd->current_cmd, sd->data_offset, io_len);
> + sd->last_cmd_name, sd->current_cmd,
> + sd->data_offset, sd->data_size, io_len);
> switch (sd->current_cmd) {
> case 6: /* CMD6: SWITCH_FUNCTION */
> case 9: /* CMD9: SEND_CSD */
> diff --git a/hw/sd/trace-events b/hw/sd/trace-events
> index 6a51b0e906..5dfe6be7b7 100644
> --- a/hw/sd/trace-events
> +++ b/hw/sd/trace-events
> @@ -55,7 +55,7 @@ sdcard_req_addr(uint32_t req_arg, uint64_t addr) "req 0x%" PRIx32 " addr 0x%" PR
> sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
> sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
> sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint8_t value) "%s %20s/ CMD%02d ofs %"PRIu32" value 0x%02x"
> -sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint32_t length) "%s %20s/ CMD%02d ofs %"PRIu32" len %" PRIu32
> +sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint64_t size, uint32_t blklen) "%s %20s/ CMD%02d ofs %"PRIu32" size %"PRIu64" blklen %" PRIu32
> sdcard_set_voltage(uint16_t millivolts) "%u mV"
>
> # pxa2xx_mmci.c