[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler
From: |
Cédric Le Goater |
Subject: |
[RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler |
Date: |
Fri, 18 Mar 2022 14:28:11 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Log illegal commands as GUEST_ERROR.
Note: we are logging back the SDIO commands (CMD5, CMD52-54).
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Message-Id: <20210624142209.1193073-6-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/sd/sd.c | 57 ++++++++++++++++++++++--------------------------------
1 file changed, 23 insertions(+), 34 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index a7c51913df82..6c677de4aadb 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -983,6 +983,14 @@ static sd_rsp_type_t sd_invalid_state_for_cmd(SDState *sd,
SDRequest req)
return sd_illegal;
}
+static sd_rsp_type_t sd_cmd_illegal(SDState *sd, SDRequest req)
+{
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Unknown CMD%i\n",
+ sd->proto->name, req.cmd);
+
+ return sd_illegal;
+}
+
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{
uint32_t rca = 0x0000;
@@ -1035,15 +1043,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 1: /* CMD1: SEND_OP_CMD */
- if (!sd->spi)
- goto bad_cmd;
-
sd->state = sd_transfer_state;
return sd_r1;
case 2: /* CMD2: ALL_SEND_CID */
- if (sd->spi)
- goto bad_cmd;
switch (sd->state) {
case sd_ready_state:
sd->state = sd_identification_state;
@@ -1055,8 +1058,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 3: /* CMD3: SEND_RELATIVE_ADDR */
- if (sd->spi)
- goto bad_cmd;
switch (sd->state) {
case sd_identification_state:
case sd_standby_state:
@@ -1070,8 +1071,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 4: /* CMD4: SEND_DSR */
- if (sd->spi)
- goto bad_cmd;
switch (sd->state) {
case sd_standby_state:
break;
@@ -1081,9 +1080,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
}
break;
- case 5: /* CMD5: reserved for SDIO cards */
- return sd_illegal;
-
case 6: /* CMD6: SWITCH_FUNCTION */
switch (sd->mode) {
case sd_data_transfer_mode:
@@ -1099,8 +1095,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 7: /* CMD7: SELECT/DESELECT_CARD */
- if (sd->spi)
- goto bad_cmd;
switch (sd->state) {
case sd_standby_state:
if (sd->rca != rca)
@@ -1230,8 +1224,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 15: /* CMD15: GO_INACTIVE_STATE */
- if (sd->spi)
- goto bad_cmd;
switch (sd->mode) {
case sd_data_transfer_mode:
if (sd->rca != rca)
@@ -1338,8 +1330,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 26: /* CMD26: PROGRAM_CID */
- if (sd->spi)
- goto bad_cmd;
switch (sd->state) {
case sd_transfer_state:
sd->state = sd_receivingdata_state;
@@ -1489,15 +1479,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
}
break;
- case 52 ... 54:
- /* CMD52, CMD53, CMD54: reserved for SDIO cards
- * (see the SDIO Simplified Specification V2.0)
- * Handle as illegal command but do not complain
- * on stderr, as some OSes may use these in their
- * probing for presence of an SDIO card.
- */
- return sd_illegal;
-
/* Application specific commands (Class 8) */
case 55: /* CMD55: APP_CMD */
switch (sd->state) {
@@ -1538,19 +1519,12 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
break;
case 58: /* CMD58: READ_OCR (SPI) */
- if (!sd->spi) {
- goto bad_cmd;
- }
return sd_r3;
case 59: /* CMD59: CRC_ON_OFF (SPI) */
- if (!sd->spi) {
- goto bad_cmd;
- }
return sd_r1;
default:
- bad_cmd:
qemu_log_mask(LOG_GUEST_ERROR, "SD: Unknown CMD%i\n", req.cmd);
return sd_illegal;
}
@@ -2137,10 +2111,25 @@ void sd_enable(SDState *sd, bool enable)
static const SDProto sd_proto_spi = {
.name = "SPI",
+ .cmd = {
+ [2 ... 4] = sd_cmd_illegal,
+ [5] = sd_cmd_illegal,
+ [7] = sd_cmd_illegal,
+ [15] = sd_cmd_illegal,
+ [26] = sd_cmd_illegal,
+ [52 ... 54] = sd_cmd_illegal,
+ },
};
static const SDProto sd_proto_sd = {
.name = "SD",
+ .cmd = {
+ [1] = sd_cmd_illegal,
+ [5] = sd_cmd_illegal,
+ [52 ... 54] = sd_cmd_illegal,
+ [58] = sd_cmd_illegal,
+ [59] = sd_cmd_illegal,
+ },
};
static void sd_instance_init(Object *obj)
--
2.34.1
- [RFC PATCH 00/17] hw/sd: Rework models for eMMC support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 02/17] hw/sd: Move proto_name to SDProto structure, Cédric Le Goater, 2022/03/18
- [RFC PATCH 01/17] hw/sd: When card is in wrong state, log which state it is, Cédric Le Goater, 2022/03/18
- [RFC PATCH 12/17] hw/sd: Fix SET_BLOCK_COUNT command argument, Cédric Le Goater, 2022/03/18
- [RFC PATCH 17/17] hw/sd: Subtract bootarea size from blk, Cédric Le Goater, 2022/03/18
- [RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler,
Cédric Le Goater <=
- [RFC PATCH 14/17] hw/sd: Add CMD21 tuning sequence, Cédric Le Goater, 2022/03/18
- [RFC PATCH 05/17] hw/sd: Add sd_cmd_unimplemented() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 13/17] hw/sd: Update CMD1 definition for MMC, Cédric Le Goater, 2022/03/18
- [RFC PATCH 11/17] hw/sd: Add eMMC support, Cédric Le Goater, 2022/03/18
- [RFC PATCH 07/17] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 10/17] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler, Cédric Le Goater, 2022/03/18
- [RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type, Cédric Le Goater, 2022/03/18
- [RFC PATCH 16/17] hw/sd: Support boot area in emmc image, Cédric Le Goater, 2022/03/18