From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>,
Peter Maydell <peter.maydell@linaro.org>,
Igor Mitsyanko <i.mitsyanko@gmail.com>,
Andrew Baumann <Andrew.Baumann@microsoft.com>,
Olbrich <m.olbrich@pengutronix.de>,
Andrzej Zaborowski <balrogg@gmail.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
"Prasad J Pandit" <pjp@fedoraproject.org>,
"Peter Crosthwaite" <crosthwaite.peter@gmail.com>,
"Paul Brook" <paul@codesourcery.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v2 21/25] sdcard: add cmd_version_supported(), improve cmd_class_supported()
Date: Wed, 3 Jan 2018 18:24:32 -0300 [thread overview]
Message-ID: <20180103212436.15762-22-f4bug@amsat.org> (raw)
In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org>
Using the cmd_supported[] array we keep track of which Spec version introduced
a command, and which class it belongs to.
This array is initialized with SD Spec v2.00.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 121 insertions(+), 7 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 16a8a7411d..0e4871869f 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -278,13 +278,121 @@ static const sd_cmd_type_t sd_cmd_type[SDCARD_CMD_MAX] = {
sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none,
};
-static const int sd_cmd_class[SDCARD_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,
- 7, 7, 10, 7, 9, 9, 9, 8, 8, 10, 8, 8, 8, 8, 8, 8,
+#define BIT_2_4 (BIT(2) | BIT(4))
+#define BIT_2_4_7 (BIT(2) | BIT(4) | BIT(7))
+#define BIT_SECU BIT(30) /* SD Specifications Part3 Security Specification */
+#define BIT_MANUF BIT(31) /* reserved for manufacturer */
+
+typedef struct {
+ struct {
+ uint16_t version;
+ uint32_t ccc_mask;
+ } sd, spi;
+} sd_cmd_supported_t;
+
+static const sd_cmd_supported_t cmd_supported[SDCARD_CMD_MAX] = {
+ /* SD SPI */
+ [0] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [1] = {{}, {200, BIT(0)}, },
+ [2] = {{200, BIT(0)}, {}, },
+ [3] = {{200, BIT(0)}, {}, },
+ [4] = {{200, BIT(0)}, {}, },
+ [5] = {{200, BIT(9)}, {200, BIT(9)}, },
+ [6] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [7] = {{200, BIT(0)}, {}, },
+ [8] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [9] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [10] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [12] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [13] = {{200, BIT(0)}, {200, BIT(0)}, },
+ [14] = {{200, BIT(0)}, {}, },
+ [15] = {{200, BIT(0)}, {}, },
+ [16] = {{200, BIT_2_4_7}, {200, BIT_2_4_7}, },
+ [17] = {{200, BIT(2)}, {200, BIT(2)}, },
+ [18] = {{200, BIT(2)}, {200, BIT(2)}, },
+ [24] = {{200, BIT(4)}, {200, BIT(4)}, },
+ [25] = {{200, BIT(4)}, {200, BIT(4)}, },
+ [26] = {{200, BIT_MANUF}, {/*?*/}, },
+ [27] = {{200, BIT(4)}, {200, BIT(4)}, },
+ [28] = {{200, BIT(6)}, {200, BIT(6)}, },
+ [29] = {{200, BIT(6)}, {200, BIT(6)}, },
+ [30] = {{200, BIT(6)}, {200, BIT(6)}, },
+ [32] = {{200, BIT(5)}, {200, BIT(5)}, },
+ [33] = {{200, BIT(5)}, {200, BIT(5)}, },
+ [34] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [35] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [36] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [37] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [38] = {{200, BIT(5)}, {200, BIT(5)}, },
+ [42] = {{200, BIT(7)}, {200, BIT(7)}, },
+ [50] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [52] = {{200, BIT(9)}, {200, BIT(9)}, },
+ [53] = {{200, BIT(9)}, {200, BIT(9)}, },
+ [54] = {{/* 2.00 SDIO */}, {/* 2.00 SDIO */}, },
+ [55] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [56] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [57] = {{200, BIT(10)}, {200, BIT(10)}, },
+ [58] = {{}, {200, BIT(0)}, },
+ [59] = {{}, {200, BIT(0)}, },
+ [60] = {{200, BIT_MANUF}, {/*?*/}, },
+ [61] = {{200, BIT_MANUF}, {/*?*/}, },
+ [62] = {{200, BIT_MANUF}, {/*?*/}, },
+ [63] = {{200, BIT_MANUF}, {/*?*/}, },
+}, acmd_supported[SDCARD_CMD_MAX] = {
+ /* SD SPI */
+ [6] = {{200, BIT(8)}, {}, },
+ [13] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [18] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [22] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [23] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [25] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [26] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [38] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [41] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [42] = {{200, BIT(8)}, {200, BIT(8)}, },
+ [43] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [44] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [45] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [46] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [47] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [48] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [49] = {{200, BIT_SECU}, {200, BIT_SECU}, },
+ [51] = {{200, BIT(8)}, {200, BIT(8)}, },
};
+static bool cmd_version_supported(SDState *sd, uint8_t cmd, bool is_acmd)
+{
+ const sd_cmd_supported_t *cmdset = is_acmd ? acmd_supported : cmd_supported;
+ uint16_t cmd_version;
+
+ cmd_version = sd->spi ? cmdset[cmd].spi.version : cmdset[cmd].sd.version;
+ if (cmd_version) {
+ return true;
+ }
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported %s%02u\n",
+ sd->proto_name, is_acmd ? "ACMD" : "CMD", cmd);
+
+ return false;
+}
+
+static bool cmd_class_supported(SDState *sd, uint8_t cmd, uint8_t class,
+ bool is_acmd)
+{
+ const sd_cmd_supported_t *cmdset = is_acmd ? acmd_supported : cmd_supported;
+ uint32_t cmd_ccc_mask;
+
+ cmd_ccc_mask = sd->spi ? cmdset[cmd].spi.ccc_mask : cmdset[cmd].sd.ccc_mask;
+
+ /* class 1, 3 and 9 are not supported in SPI mode */
+ if (cmd_ccc_mask & BIT(class)) {
+ return true;
+ }
+ qemu_log_mask(LOG_GUEST_ERROR, "%s: Unsupported %s%02u (class %d)\n",
+ sd->proto_name, is_acmd ? "ACMD" : "CMD", cmd, class);
+
+ return false;
+}
+
static uint8_t sd_crc7(void *message, size_t width)
{
int i, bit;
@@ -1570,8 +1678,8 @@ static bool cmd_valid_while_locked(SDState *sd, SDRequest *req)
if (req->cmd == 16 || req->cmd == 55) {
return true;
}
- return sd_cmd_class[req->cmd] == 0
- || sd_cmd_class[req->cmd] == 7;
+ return cmd_class_supported(sd, req->cmd, 0, false) ||
+ cmd_class_supported(sd, req->cmd, 7, false);
}
int sd_do_command(SDState *sd, SDRequest *req,
@@ -1596,6 +1704,12 @@ int sd_do_command(SDState *sd, SDRequest *req,
req->cmd &= 0x3f;
}
+ if (!cmd_version_supported(sd, req->cmd, sd->expecting_acmd)) {
+ sd->card_status |= ILLEGAL_COMMAND;
+ rtype = sd_illegal;
+ goto send_response;
+ }
+
if (sd->card_status & CARD_IS_LOCKED) {
if (!cmd_valid_while_locked(sd, req)) {
sd->card_status |= ILLEGAL_COMMAND;
--
2.15.1
next prev parent reply other threads:[~2018-01-03 21:26 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 21:24 [Qemu-devel] [PATCH v2 00/25] SDCard: housekeeping, improve SPI, introduce new Specs Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 01/25] sdcard: reorder SDState struct members Philippe Mathieu-Daudé
2018-01-08 21:46 ` Alistair Francis
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 02/25] sdcard: replace DPRINTF() by trace events Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 03/25] sdcard: add more " Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 04/25] sdcard: define SDCARD_CMD_MAX instead of using the magic '64' Philippe Mathieu-Daudé
2018-01-08 21:47 ` Alistair Francis
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 05/25] sdcard: display command name when tracing CMD/ACMD Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 06/25] sdcard: let cmd_valid_while_locked() returns a bool Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 07/25] sdcard: rename sd_set_$REG() functions called once as sd_reset_$REG() Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 08/25] sdcard: use the registerfields API to access the OCR register Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 09/25] sdcard: use G_BYTE from cutils Philippe Mathieu-Daudé
2018-01-08 21:45 ` Alistair Francis
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 10/25] sdcard: remove unreachable code Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 11/25] sdcard: replace switch(unique case) statements -> if(case) Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 12/25] sdcard: use a 16-bit integer for the 16-bit RCA register Philippe Mathieu-Daudé
2018-01-08 21:49 ` Alistair Francis
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 13/25] sdcard: let function handling response codes returns the response size Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 14/25] sdcard: add missing command CMD55 Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 15/25] sdcard: add missing CMD54 SDIO command Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [RFC PATCH v2 16/25] sdcard: add missing SPI legal commands Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [RFC PATCH v2 17/25] sdcard: fix SPI response length Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 18/25] sdcard: add an enum for the SD PHY Spec version Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 19/25] sdcard: check if the card capacity is supported Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 20/25] sdcard: Don't always set the high capacity bit Philippe Mathieu-Daudé
2018-01-03 21:24 ` Philippe Mathieu-Daudé [this message]
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 22/25] sdcard: remove unreachable SPI commands Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [RFC PATCH v2 23/25] sdcard: store the bus protocol in an enum Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 24/25] sdcard: introduce Spec v3.01 SD commands Philippe Mathieu-Daudé
2018-01-03 21:24 ` [Qemu-devel] [PATCH v2 25/25] sdcard: introduce Spec v4.51 & v5.1 MMC commands Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180103212436.15762-22-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=Andrew.Baumann@microsoft.com \
--cc=alistair.francis@xilinx.com \
--cc=balrogg@gmail.com \
--cc=crosthwaite.peter@gmail.com \
--cc=edgar.iglesias@xilinx.com \
--cc=i.mitsyanko@gmail.com \
--cc=m.olbrich@pengutronix.de \
--cc=marcandre.lureau@redhat.com \
--cc=paul@codesourcery.com \
--cc=peter.maydell@linaro.org \
--cc=pjp@fedoraproject.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).