qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-block@nongnu.org
Subject: [PULL 11/18] hw/sd: sd: Only SDSC cards support CMD28/29/30
Date: Sat, 20 Feb 2021 01:13:02 +0100	[thread overview]
Message-ID: <20210220001309.2225022-12-f4bug@amsat.org> (raw)
In-Reply-To: <20210220001309.2225022-1-f4bug@amsat.org>

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210216150225.27996-3-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sd/sd.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 7adcb4edfaa..dd1ce0bdae4 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.26.2



  parent reply	other threads:[~2021-02-20  0:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-20  0:12 [PULL 00/18] SD/MMC patches for 2021-02-20 Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 01/18] hw/sd: ssi-sd: Support multiple block read Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 02/18] hw/sd: sd: Remove duplicated codes in single/multiple block read/write Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 03/18] hw/sd: sd: Allow single/multiple block write for SPI mode Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 04/18] hw/sd: Introduce receive_ready() callback Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 05/18] hw/sd: ssi-sd: Support single block write Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 06/18] hw/sd: ssi-sd: Support multiple " Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 07/18] hw/sd: ssi-sd: Fix SEND_IF_COND (CMD8) response Philippe Mathieu-Daudé
2021-02-20  0:12 ` [PULL 08/18] hw/sd: ssi-sd: Fix STOP_TRANSMISSION (CMD12) response Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 09/18] hw/sd: ssi-sd: Handle the rest commands with R1b response type Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 10/18] hw/sd: sd: Fix address check in sd_erase() Philippe Mathieu-Daudé
2021-02-20  0:13 ` Philippe Mathieu-Daudé [this message]
2021-02-20  0:13 ` [PULL 12/18] hw/sd: sd: Fix CMD30 response type Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 13/18] hw/sd: sd: Move the sd_block_{read, write} and macros ahead Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 14/18] hw/sd: sd: Skip write protect groups check in sd_erase() for high capacity cards Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 15/18] hw/sd: sd: Skip write protect groups check in CMD24/25 " Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 16/18] hw/sd: sd: Bypass the RCA check for CMD13 in SPI mode Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 17/18] hw/sd: sdhci: Simplify updating s->prnsts in sdhci_sdma_transfer_multi_blocks() Philippe Mathieu-Daudé
2021-02-20  0:13 ` [PULL 18/18] MAINTAINERS: Add Bin Meng as co-maintainer for SD/MMC cards Philippe Mathieu-Daudé
2021-02-21 11:45 ` [PULL 00/18] SD/MMC patches for 2021-02-20 Peter Maydell

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=20210220001309.2225022-12-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=bin.meng@windriver.com \
    --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).