[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 07/11] sdcard: define SDMMC_CMD_MAX instead of us
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 07/11] sdcard: define SDMMC_CMD_MAX instead of using the magic '64' |
Date: |
Thu, 15 Feb 2018 19:05:36 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
Since v3: add "sdmmc-internal.h"
hw/sd/sdmmc-internal.h | 15 +++++++++++++++
hw/sd/sd.c | 22 ++++++++++++++++------
2 files changed, 31 insertions(+), 6 deletions(-)
create mode 100644 hw/sd/sdmmc-internal.h
diff --git a/hw/sd/sdmmc-internal.h b/hw/sd/sdmmc-internal.h
new file mode 100644
index 0000000000..0e96cb0081
--- /dev/null
+++ b/hw/sd/sdmmc-internal.h
@@ -0,0 +1,15 @@
+/*
+ * SD/MMC cards common
+ *
+ * Copyright (c) 2018 Philippe Mathieu-Daudé <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#ifndef SD_INTERNAL_H
+#define SD_INTERNAL_H
+
+#define SDMMC_CMD_MAX 64
+
+#endif
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index af4df2b104..6acd6b3c5c 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -40,6 +40,7 @@
#include "qemu/error-report.h"
#include "qemu/timer.h"
#include "qemu/log.h"
+#include "sdmmc-internal.h"
#include "trace.h"
//#define DEBUG_SD 1
@@ -215,18 +216,21 @@ static void sd_set_mode(SDState *sd)
}
}
-static const sd_cmd_type_t sd_cmd_type[64] = {
+static const sd_cmd_type_t sd_cmd_type[SDMMC_CMD_MAX] = {
sd_bc, sd_none, sd_bcr, sd_bcr, sd_none, sd_none, sd_none, sd_ac,
sd_bcr, sd_ac, sd_ac, sd_adtc, sd_ac, sd_ac, sd_none, sd_ac,
+ /* 16 */
sd_ac, sd_adtc, sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none,
sd_adtc, sd_adtc, sd_adtc, sd_adtc, sd_ac, sd_ac, sd_adtc, sd_none,
+ /* 32 */
sd_ac, sd_ac, sd_none, sd_none, sd_none, sd_none, sd_ac, sd_none,
sd_none, sd_none, sd_bc, sd_none, sd_none, sd_none, sd_none, sd_none,
+ /* 48 */
sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac,
sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
};
-static const int sd_cmd_class[64] = {
+static const int sd_cmd_class[SDMMC_CMD_MAX] = {
0, 0, 0, 0, 0, 9, 10, 0, 0, 0, 0, 1, 0, 0, 0, 0,
2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 6, 6, 6, 6,
5, 5, 10, 10, 10, 10, 5, 9, 9, 9, 7, 7, 7, 7, 7, 7,
@@ -831,8 +835,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
/* Not interpreting this as an app command */
sd->card_status &= ~APP_CMD;
- if (sd_cmd_type[req.cmd & 0x3F] == sd_ac
- || sd_cmd_type[req.cmd & 0x3F] == sd_adtc) {
+ if (sd_cmd_type[req.cmd] == sd_ac
+ || sd_cmd_type[req.cmd] == sd_adtc) {
rca = req.arg >> 16;
}
@@ -1544,8 +1548,8 @@ static int cmd_valid_while_locked(SDState *sd, SDRequest
*req)
if (req->cmd == 16 || req->cmd == 55) {
return 1;
}
- return sd_cmd_class[req->cmd & 0x3F] == 0
- || sd_cmd_class[req->cmd & 0x3F] == 7;
+ return sd_cmd_class[req->cmd] == 0
+ || sd_cmd_class[req->cmd] == 7;
}
int sd_do_command(SDState *sd, SDRequest *req,
@@ -1564,6 +1568,12 @@ int sd_do_command(SDState *sd, SDRequest *req,
goto send_response;
}
+ if (req->cmd >= SDMMC_CMD_MAX) {
+ qemu_log_mask(LOG_GUEST_ERROR, "SD: incorrect command 0x%02x\n",
+ req->cmd);
+ req->cmd &= 0x3f;
+ }
+
if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req)) {
sd->card_status |= ILLEGAL_COMMAND;
--
2.16.1
- [Qemu-devel] [PATCH v4 00/11] SDCard: housekeeping, add tracing (part 4), Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 01/11] sdcard: reorder SDState struct members, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 02/11] sdcard: replace DPRINTF() by trace events, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 03/11] sdcard: add a trace event for command responses, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 04/11] sdcard: replace fprintf() by qemu_hexdump(), Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 05/11] sdcard: add more trace events, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 06/11] sdcard: do not trace CMD55 when expecting ACMD, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 07/11] sdcard: define SDMMC_CMD_MAX instead of using the magic '64',
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 08/11] sdcard: display command name when tracing CMD/ACMD, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 09/11] sdcard: display protocol used when tracing, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 10/11] sdcard: use G_BYTE from cutils, Philippe Mathieu-Daudé, 2018/02/15
- [Qemu-devel] [PATCH v4 11/11] sdcard: use the registerfields API to access the OCR register, Philippe Mathieu-Daudé, 2018/02/15
- Re: [Qemu-devel] [PATCH v4 00/11] SDCard: housekeeping, add tracing (part 4), Philippe Mathieu-Daudé, 2018/02/22
- Re: [Qemu-devel] [PATCH v4 00/11] SDCard: housekeeping, add tracing (part 4), Peter Maydell, 2018/02/22