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 | 36 +++++++++++++++++-------------------
> 1 file changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 5461e56e17..50cee5ac40 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -245,7 +245,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
> [25] = "WRITE_MULTIPLE_BLOCK",
> [26] = "MANUF_RSVD",
> [40] = "DPS_spec",
> - [56] = "GEN_CMD",
> [60] = "MANUF_RSVD", [61] = "MANUF_RSVD",
> [62] = "MANUF_RSVD", [63] = "MANUF_RSVD",
> };
> @@ -910,9 +909,6 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
> }
> }
>
> -#define APP_READ_BLOCK(a, len) memset(sd->data, 0xec, len)
> -#define APP_WRITE_BLOCK(a, len)
> -
> static void sd_erase(SDState *sd)
> {
> uint64_t erase_start = sd->erase_start;
> @@ -1649,6 +1645,21 @@ static sd_rsp_type_t sd_cmd_APP_CMD(SDState *sd, SDRequest req)
> return sd_r1;
> }
>
> +/* CMD56 */
> +static sd_rsp_type_t sd_cmd_GEN_CMD(SDState *sd, SDRequest req)
> +{
> + if (sd->state != sd_transfer_state) {
> + return sd_invalid_state_for_cmd(sd, req);
> + }
> +
> + if (req.arg & 1) {
> + return sd_cmd_to_sendingdata(sd, req, 0,
> + sd->vendor_data, sizeof(sd->vendor_data));
> + } else {
> + return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->vendor_data));
> + }
> +}
> +
> static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> {
> uint64_t addr;
> @@ -1737,21 +1748,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->cid));
>
> /* Application specific commands (Class 8) */
> - case 56: /* CMD56: GEN_CMD */
> - switch (sd->state) {
> - case sd_transfer_state:
> - if (req.arg & 1) {
> - return sd_cmd_to_sendingdata(sd, req, 0,
> - sd->vendor_data,
> - sizeof(sd->vendor_data));
> - }
> - return sd_cmd_to_receivingdata(sd, req, 0, sizeof(sd->vendor_data));
> -
> - default:
> - break;
> - }
> - break;
> -
> case 58: /* CMD58: READ_OCR (SPI) */
> return sd_r3;
>
> @@ -2323,6 +2319,7 @@ static const SDProto sd_proto_spi = {
> [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional},
> [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional},
> [55] = {8, sd_spi, "APP_CMD", sd_cmd_APP_CMD},
> + [56] = {8, sd_spi, "GEN_CMD", sd_cmd_GEN_CMD},
> [57] = {10, sd_spi, "DIRECT_SECURE_WRITE", sd_cmd_optional},
> },
> .acmd = {
> @@ -2376,6 +2373,7 @@ static const SDProto sd_proto_sd = {
> [52] = {9, sd_bc, "IO_RW_DIRECT", sd_cmd_optional},
> [53] = {9, sd_bc, "IO_RW_EXTENDED", sd_cmd_optional},
> [55] = {8, sd_ac, "APP_CMD", sd_cmd_APP_CMD},
> + [56] = {8, sd_adtc, "GEN_CMD", sd_cmd_GEN_CMD},
> [57] = {10, sd_adtc, "DIRECT_SECURE_WRITE", sd_cmd_optional},
> [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional},
> [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional},