motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-28 21:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/sdcard: Add sd_acmd_SET_BUS_WIDTH handler (ACMD6)

Browse source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-69-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-12 23:42:52 +02:00
parent 95e9305bf9
commit 55f2645eab
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hw/sd/sd.c
View file

@ -258,7 +258,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)
static const char *sd_acmd_name(SDState *sd, uint8_t cmd) static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
{ {
static const char *acmd_abbrev[SDMMC_CMD_MAX] = { static const char *acmd_abbrev[SDMMC_CMD_MAX] = {
[6] = "SET_BUS_WIDTH",
[13] = "SD_STATUS", [13] = "SD_STATUS",
[14] = "DPS_spec", [15] = "DPS_spec", [14] = "DPS_spec", [15] = "DPS_spec",
[16] = "DPS_spec", [16] = "DPS_spec",
@ -1653,6 +1652,18 @@ static sd_rsp_type_t spi_cmd_CRC_ON_OFF(SDState *sd, SDRequest req)
return sd_r1; return sd_r1;
} }
/* ACMD6 */
static sd_rsp_type_t sd_acmd_SET_BUS_WIDTH(SDState *sd, SDRequest req)
{
if (sd->state != sd_transfer_state) {
return sd_invalid_state_for_cmd(sd, req);
}
sd->sd_status[0] &= 0x3f;
sd->sd_status[0] |= (req.arg & 0x03) << 6;
return sd_r1;
}
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{ {
uint64_t addr; uint64_t addr;
@ -1777,18 +1788,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
} }
switch (req.cmd) { switch (req.cmd) {
case 6: /* ACMD6: SET_BUS_WIDTH */
switch (sd->state) {
case sd_transfer_state:
sd->sd_status[0] &= 0x3f;
sd->sd_status[0] |= (req.arg & 0x03) << 6;
return sd_r1;
default:
break;
}
break;
case 13: /* ACMD13: SD_STATUS */ case 13: /* ACMD13: SD_STATUS */
switch (sd->state) { switch (sd->state) {
case sd_transfer_state: case sd_transfer_state:
@ -2390,6 +2389,9 @@ static const SDProto sd_proto_sd = {
[58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional},
[59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional}, [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional},
}, },
.acmd = {
[6] = {8, sd_ac, "SET_BUS_WIDTH", sd_acmd_SET_BUS_WIDTH},
},
}; };
static void sd_instance_init(Object *obj) static void sd_instance_init(Object *obj)