qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 19/25] sdcard: check if the card capacity is supported
Date: Wed,  3 Jan 2018 18:24:30 -0300	[thread overview]
Message-ID: <20180103212436.15762-20-f4bug@amsat.org> (raw)
In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org>

The current Spec (v2.00) does not support SDXC cards (> 32GB).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/sd/sd.c         | 41 +++++++++++++++++++++++++++++++++++++++++
 hw/sd/trace-events |  1 +
 2 files changed, 42 insertions(+)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index ed5874e4d6..a7cede8da6 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -63,6 +63,13 @@ typedef enum {
     SD_PHY_SPEC_VER_3_01 = 301, /* not yet supported */
 } sd_phy_spec_ver_t;
 
+typedef enum {
+    sd_capacity_unknown,
+    sd_capacity_sdsc,           /* not well supported */
+    sd_capacity_sdhc,
+    sd_capacity_sdxc,           /* not yet supported */
+} sd_card_capacity_t;
+
 typedef enum {
     sd_r0 = 0,    /* no response */
     sd_r1,        /* normal response command */
@@ -121,6 +128,7 @@ struct SDState {
 
     int spec_version;
     bool spi;
+    sd_card_capacity_t capacity;
 
     uint32_t mode;    /* current card mode, one of SDCardModes */
     int32_t state;    /* current card state, one of SDCardStates */
@@ -161,6 +169,17 @@ static const char *sd_state_name(enum SDCardStates state)
     return state_name[state];
 }
 
+static const char *sd_capacity(sd_card_capacity_t capacity)
+{
+    static const char *capacity_name[] = {
+        [sd_capacity_unknown]   = "UNKN",
+        [sd_capacity_sdsc]      = "SDSC",
+        [sd_capacity_sdhc]      = "SDHC",
+        [sd_capacity_sdxc]      = "SDXC",
+    };
+    return capacity_name[capacity];
+}
+
 static const char *sd_cmd_abbreviation(uint8_t cmd)
 {
     static const char *cmd_abbrev[SDCARD_CMD_MAX] = {
@@ -1991,11 +2010,33 @@ static void sd_realize(DeviceState *dev, Error **errp)
     }
 
     if (sd->blk) {
+        int64_t size;
+
         ret = blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE,
                            BLK_PERM_ALL, errp);
         if (ret < 0) {
             return;
         }
+
+        size = blk_getlength(sd->blk);
+        if (size < 0 || size <= 2 * G_BYTE) {
+            sd->capacity = sd_capacity_sdsc;
+        } else if (size <= 32 * G_BYTE) {
+            sd->capacity = sd_capacity_sdhc;
+        } else if (size <= 2 * T_BYTE) {
+            sd->capacity = sd_capacity_sdxc;
+        } else {
+            error_setg(errp, "block size unsupported: %lld TB", size / T_BYTE);
+            return;
+        }
+        trace_sdcard_capacity(sd_capacity(sd->capacity), size);
+
+        if (sd->capacity == sd_capacity_sdxc
+                && sd->spec_version < SD_PHY_SPEC_VER_3_01) {
+            error_setg(errp, "capacity SDHC requires at least Spec v3.01");
+            return;
+        }
+
         blk_set_dev_ops(sd->blk, &sd_block_ops, sd);
     }
 }
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index 25ab339f97..215e0eec3a 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -28,6 +28,7 @@ sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
 sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
 sdcard_write_data(uint8_t value) "value 0x%02x"
 sdcard_read_data(int length) "len %d"
+sdcard_capacity(const char *capacity, int64_t size) "%s card (%ld B)"
 
 # hw/sd/milkymist-memcard.c
 milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
-- 
2.15.1

  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 ` Philippe Mathieu-Daudé [this message]
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 ` [Qemu-devel] [PATCH v2 21/25] sdcard: add cmd_version_supported(), improve cmd_class_supported() Philippe Mathieu-Daudé
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-20-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).