| Message ID | 20240628070216.92609-45-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/sd/sdcard: Add eMMC support | expand |
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 | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 74aa38a442..406fadb3b4 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -258,15 +258,11 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) > [36] = "SW_FUNC_RSVD", [37] = "SW_FUNC_RSVD", > [38] = "ERASE", > [40] = "DPS_spec", > - [42] = "LOCK_UNLOCK", [43] = "Q_MANAGEMENT", > - [44] = "Q_TASK_INFO_A", [45] = "Q_TASK_INFO_B", > - [46] = "Q_RD_TASK", [47] = "Q_WR_TASK", > - [48] = "READ_EXTR_SINGLE", [49] = "WRITE_EXTR_SINGLE", > + [42] = "LOCK_UNLOCK", > [50] = "SW_FUNC_RSVD", > [52] = "IO_RW_DIRECT", [53] = "IO_RW_EXTENDED", > [54] = "SDIO_RSVD", [55] = "APP_CMD", > [56] = "GEN_CMD", [57] = "SW_FUNC_RSVD", > - [58] = "READ_EXTR_MULTI", [59] = "WRITE_EXTR_MULTI", > [60] = "MANUF_RSVD", [61] = "MANUF_RSVD", > [62] = "MANUF_RSVD", [63] = "MANUF_RSVD", > }; > @@ -2291,6 +2287,15 @@ static const SDProto sd_proto_sd = { > [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}, > + [43] = {1, sd_ac, "Q_MANAGEMENT", sd_cmd_optional}, > + [44] = {1, sd_ac, "Q_TASK_INFO_A", sd_cmd_optional}, > + [45] = {1, sd_ac, "Q_TASK_INFO_B", sd_cmd_optional}, > + [46] = {1, sd_adtc, "Q_RD_TASK", sd_cmd_optional}, > + [47] = {1, sd_adtc, "Q_WR_TASK", sd_cmd_optional}, > + [48] = {1, sd_adtc, "READ_EXTR_SINGLE", sd_cmd_optional}, > + [49] = {1, sd_adtc, "WRITE_EXTR_SINGLE", sd_cmd_optional}, > + [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, > + [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional}, > }, > }; >
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 74aa38a442..406fadb3b4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -258,15 +258,11 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [36] = "SW_FUNC_RSVD", [37] = "SW_FUNC_RSVD", [38] = "ERASE", [40] = "DPS_spec", - [42] = "LOCK_UNLOCK", [43] = "Q_MANAGEMENT", - [44] = "Q_TASK_INFO_A", [45] = "Q_TASK_INFO_B", - [46] = "Q_RD_TASK", [47] = "Q_WR_TASK", - [48] = "READ_EXTR_SINGLE", [49] = "WRITE_EXTR_SINGLE", + [42] = "LOCK_UNLOCK", [50] = "SW_FUNC_RSVD", [52] = "IO_RW_DIRECT", [53] = "IO_RW_EXTENDED", [54] = "SDIO_RSVD", [55] = "APP_CMD", [56] = "GEN_CMD", [57] = "SW_FUNC_RSVD", - [58] = "READ_EXTR_MULTI", [59] = "WRITE_EXTR_MULTI", [60] = "MANUF_RSVD", [61] = "MANUF_RSVD", [62] = "MANUF_RSVD", [63] = "MANUF_RSVD", }; @@ -2291,6 +2287,15 @@ static const SDProto sd_proto_sd = { [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}, + [43] = {1, sd_ac, "Q_MANAGEMENT", sd_cmd_optional}, + [44] = {1, sd_ac, "Q_TASK_INFO_A", sd_cmd_optional}, + [45] = {1, sd_ac, "Q_TASK_INFO_B", sd_cmd_optional}, + [46] = {1, sd_adtc, "Q_RD_TASK", sd_cmd_optional}, + [47] = {1, sd_adtc, "Q_WR_TASK", sd_cmd_optional}, + [48] = {1, sd_adtc, "READ_EXTR_SINGLE", sd_cmd_optional}, + [49] = {1, sd_adtc, "WRITE_EXTR_SINGLE", sd_cmd_optional}, + [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, + [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional}, }, };
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/sd/sd.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)