From: Bin Meng <bmeng.cn@gmail.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: Bin Meng <bin.meng@windriver.com>
Subject: [PATCH v2 2/8] hw/sd: sd: Only SDSC cards support CMD28/29/30
Date: Tue, 16 Feb 2021 23:02:19 +0800 [thread overview]
Message-ID: <20210216150225.27996-3-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20210216150225.27996-1-bmeng.cn@gmail.com>
From: Bin Meng <bin.meng@windriver.com>
Per the "Physical Layer Specification Version 8.00", table 4-26
(SD mode) and table 7-3 (SPI mode) command descriptions, the
following commands:
- CMD28 (SET_WRITE_PROT)
- CMD29 (CLR_WRITE_PROT)
- CMD30 (SEND_WRITE_PROT)
are only supported by SDSC cards.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
Changes in v2:
- new patch: sd: Only SDSC cards support CMD28/29/30
hw/sd/sd.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index a6a0b3dcc6..273bae0a9a 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1284,6 +1284,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
/* Write protection (Class 6) */
case 28: /* CMD28: SET_WRITE_PROT */
+ if (sd->size > SDSC_MAX_CAPACITY) {
+ return sd_illegal;
+ }
+
switch (sd->state) {
case sd_transfer_state:
if (addr >= sd->size) {
@@ -1303,6 +1307,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
break;
case 29: /* CMD29: CLR_WRITE_PROT */
+ if (sd->size > SDSC_MAX_CAPACITY) {
+ return sd_illegal;
+ }
+
switch (sd->state) {
case sd_transfer_state:
if (addr >= sd->size) {
@@ -1322,6 +1330,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
break;
case 30: /* CMD30: SEND_WRITE_PROT */
+ if (sd->size > SDSC_MAX_CAPACITY) {
+ return sd_illegal;
+ }
+
switch (sd->state) {
case sd_transfer_state:
sd->state = sd_sendingdata_state;
--
2.25.1
next prev parent reply other threads:[~2021-02-16 15:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 15:02 [PATCH v2 0/8] hw/sd: sd: Erase operation and other fixes Bin Meng
2021-02-16 15:02 ` [PATCH v2 1/8] hw/sd: sd: Fix address check in sd_erase() Bin Meng
2021-02-16 15:02 ` Bin Meng [this message]
2021-02-16 15:32 ` [PATCH v2 2/8] hw/sd: sd: Only SDSC cards support CMD28/29/30 Philippe Mathieu-Daudé
2021-02-16 15:02 ` [PATCH v2 3/8] hw/sd: sd: Fix CMD30 response type Bin Meng
2021-02-19 22:14 ` Philippe Mathieu-Daudé
2021-02-16 15:02 ` [PATCH v2 4/8] hw/sd: sd: Move the sd_block_{read, write} and macros ahead Bin Meng
2021-02-16 15:02 ` [PATCH v2 5/8] hw/sd: sd: Skip write protect groups check in sd_erase() for high capacity cards Bin Meng
2021-02-19 22:30 ` Philippe Mathieu-Daudé
2021-02-16 15:02 ` [PATCH v2 6/8] hw/sd: sd: Actually perform the erase operation Bin Meng
2021-02-19 22:28 ` Philippe Mathieu-Daudé
2021-02-20 2:41 ` Bin Meng
2021-02-16 15:02 ` [PATCH v2 7/8] hw/sd: sd: Skip write protect groups check in CMD24/25 for high capacity cards Bin Meng
2021-02-19 22:22 ` Philippe Mathieu-Daudé
2021-02-16 15:02 ` [PATCH v2 8/8] hw/sd: sd: Bypass the RCA check for CMD13 in SPI mode Bin Meng
2021-02-16 15:23 ` Philippe Mathieu-Daudé
2021-02-19 22:34 ` [PATCH v2 0/8] hw/sd: sd: Erase operation and other fixes 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=20210216150225.27996-3-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=bin.meng@windriver.com \
--cc=f4bug@amsat.org \
--cc=qemu-block@nongnu.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).