mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/sdcard: Add sd_acmd_SEND_SCR handler (ACMD51)

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-75-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-12 23:48:03 +02:00
parent 7614306f2a
commit 8442e1625b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/sd/sd.c
View File

@ -261,7 +261,6 @@ static const char *sd_acmd_name(SDState *sd, uint8_t cmd)
[14] = "DPS_spec", [15] = "DPS_spec", [14] = "DPS_spec", [15] = "DPS_spec",
[16] = "DPS_spec", [16] = "DPS_spec",
[18] = "SECU_spec", [18] = "SECU_spec",
[51] = "SEND_SCR",
[52] = "SECU_spec", [53] = "SECU_spec", [52] = "SECU_spec", [53] = "SECU_spec",
[54] = "SECU_spec", [54] = "SECU_spec",
[56] = "SECU_spec", [57] = "SECU_spec", [56] = "SECU_spec", [57] = "SECU_spec",
@ -1739,6 +1738,12 @@ static sd_rsp_type_t sd_acmd_SET_CLR_CARD_DETECT(SDState *sd, SDRequest req)
return sd_r1; return sd_r1;
} }
/* ACMD51 */
static sd_rsp_type_t sd_acmd_SEND_SCR(SDState *sd, SDRequest req)
{
return sd_cmd_to_sendingdata(sd, req, 0, sd->scr, sizeof(sd->scr));
}
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;
@ -1863,16 +1868,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
} }
switch (req.cmd) { switch (req.cmd) {
case 51: /* ACMD51: SEND_SCR */
switch (sd->state) {
case sd_transfer_state:
return sd_cmd_to_sendingdata(sd, req, 0, sd->scr, sizeof(sd->scr));
default:
break;
}
break;
case 18: /* Reserved for SD security applications */ case 18: /* Reserved for SD security applications */
case 25: case 25:
case 26: case 26:
@ -2333,6 +2328,7 @@ static const SDProto sd_proto_spi = {
[23] = {8, sd_spi, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT}, [23] = {8, sd_spi, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT},
[41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, [41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
[42] = {8, sd_spi, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT}, [42] = {8, sd_spi, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT},
[51] = {8, sd_spi, "SEND_SCR", sd_acmd_SEND_SCR},
}, },
}; };
@ -2393,6 +2389,7 @@ static const SDProto sd_proto_sd = {
[23] = {8, sd_ac, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT}, [23] = {8, sd_ac, "SET_WR_BLK_ERASE_COUNT", sd_acmd_SET_WR_BLK_ERASE_COUNT},
[41] = {8, sd_bcr, "SD_APP_OP_COND", sd_acmd_SD_APP_OP_COND}, [41] = {8, sd_bcr, "SD_APP_OP_COND", sd_acmd_SD_APP_OP_COND},
[42] = {8, sd_ac, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT}, [42] = {8, sd_ac, "SET_CLR_CARD_DETECT", sd_acmd_SET_CLR_CARD_DETECT},
[51] = {8, sd_adtc, "SEND_SCR", sd_acmd_SEND_SCR},
}, },
}; };