[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler |
Date: |
Mon, 30 May 2022 21:37:58 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[ clg: Fix redundant assignment of .cmd ]
Message-Id: <20210624142209.1193073-7-f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/sd/sd.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index bda24bc042..e018498b10 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1011,6 +1011,15 @@ static sd_rsp_type_t sd_cmd_illegal(SDState *sd,
SDRequest req)
return sd_illegal;
}
+/* Commands that are recognised but not yet implemented. */
+static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req)
+{
+ qemu_log_mask(LOG_UNIMP, "%s: CMD%i not implemented\n",
+ sd_proto(sd)->name, req.cmd);
+
+ return sd_illegal;
+}
+
static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
{
uint32_t rca = 0x0000;
@@ -1565,9 +1574,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
switch (req.cmd) {
case 6: /* ACMD6: SET_BUS_WIDTH */
- if (sd->spi) {
- goto unimplemented_spi_cmd;
- }
switch (sd->state) {
case sd_transfer_state:
sd->sd_status[0] &= 0x3f;
@@ -1698,12 +1704,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
default:
/* Fall back to standard commands. */
return sd_normal_command(sd, req);
-
- unimplemented_spi_cmd:
- /* Commands that are recognised but not yet implemented in SPI mode.
*/
- qemu_log_mask(LOG_UNIMP, "SD: CMD%i not implemented in SPI mode\n",
- req.cmd);
- return sd_illegal;
}
qemu_log_mask(LOG_GUEST_ERROR, "SD: ACMD%i in a wrong state\n", req.cmd);
@@ -2139,6 +2139,9 @@ static const SDProto sd_proto_spi = {
[26] = sd_cmd_illegal,
[52 ... 54] = sd_cmd_illegal,
},
+ .acmd = {
+ [6] = sd_cmd_unimplemented,
+ },
};
static const SDProto sd_proto_sd = {
--
2.36.1
- [PATCH v2 00/25] hw/sd: Rework models for eMMC support, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 01/25] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 02/25] hw/sd: When card is in wrong state, log which state it is, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 03/25] hw/sd: When card is in wrong state, log which spec version is used, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 04/25] hw/sd: Move proto_name to SDProto structure, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 06/25] hw/sd: Add sd_cmd_illegal() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler,
Philippe Mathieu-Daudé <=
- [PATCH v2 08/25] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 09/25] hw/sd: Add sd_cmd_SEND_OP_CMD() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 10/25] hw/sd: Add sd_cmd_ALL_SEND_CID() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 11/25] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 12/25] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 13/25] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 14/25] hw/sd: Basis for eMMC support, Philippe Mathieu-Daudé, 2022/05/30