From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair@alistair23.me>,
Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 3/8] sdcard: Add a 'spec_version' property
Date: Sat, 2 Jun 2018 21:08:22 -0300 [thread overview]
Message-ID: <20180603000827.30872-4-f4bug@amsat.org> (raw)
In-Reply-To: <20180603000827.30872-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/hw/sd/sd.h | 4 ++++
hw/sd/sd.c | 11 +++++++++++
2 files changed, 15 insertions(+)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 9bdb3c9285..49f22b0b89 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -54,6 +54,10 @@
#define APP_CMD (1 << 5)
#define AKE_SEQ_ERROR (1 << 3)
+enum SDPhySpecificationVersion {
+ SD_PHY_SPECv1_10_VERS = 1,
+};
+
typedef enum {
SD_VOLTAGE_0_4V = 400, /* currently not supported */
SD_VOLTAGE_1_8V = 1800,
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 80e70dd93e..5ddd211114 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -91,6 +91,7 @@ struct SDState {
uint8_t sd_status[64];
/* Configurable properties */
+ uint8_t spec_version;
BlockBackend *blk;
bool spi;
@@ -2058,6 +2059,14 @@ static void sd_realize(DeviceState *dev, Error **errp)
sd->proto_name = sd->spi ? "SPI" : "SD";
+ switch (sd->spec_version) {
+ case SD_PHY_SPECv1_10_VERS:
+ break;
+ default:
+ error_setg(errp, "Invalid SD card Spec version: %u", sd->spec_version);
+ return;
+ }
+
if (sd->blk && blk_is_read_only(sd->blk)) {
error_setg(errp, "Cannot use read-only drive as SD card");
return;
@@ -2074,6 +2083,8 @@ static void sd_realize(DeviceState *dev, Error **errp)
}
static Property sd_properties[] = {
+ DEFINE_PROP_UINT8("spec_version", SDState,
+ spec_version, SD_PHY_SPECv1_10_VERS),
DEFINE_PROP_DRIVE("drive", SDState, blk),
/* We do not model the chip select pin, so allow the board to select
* whether card should be in SSI or MMC/SD mode. It is also up to the
--
2.17.1
next prev parent reply other threads:[~2018-06-03 0:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-03 0:08 [Qemu-devel] [PATCH 0/8] sdcard: cleanup the SD_SPEC version Philippe Mathieu-Daudé
2018-06-03 0:08 ` [Qemu-devel] [PATCH 1/8] sdcard: Update the Configuration Register (SCR) to Spec Version 1.10 Philippe Mathieu-Daudé
2018-06-07 11:00 ` Peter Maydell
2018-06-07 15:14 ` Philippe Mathieu-Daudé
2018-06-07 15:16 ` Peter Maydell
2018-06-07 16:47 ` Philippe Mathieu-Daudé
2018-06-03 0:08 ` [Qemu-devel] [PATCH 2/8] sdcard: Allow commands valid in SPI mode Philippe Mathieu-Daudé
2018-06-04 18:21 ` Alistair Francis
2018-06-03 0:08 ` Philippe Mathieu-Daudé [this message]
2018-06-04 18:21 ` [Qemu-devel] [PATCH 3/8] sdcard: Add a 'spec_version' property Alistair Francis
2018-06-03 0:08 ` [Qemu-devel] [PATCH 4/8] sdcard: Set Spec v2.00 as default Philippe Mathieu-Daudé
2018-06-04 18:23 ` Alistair Francis
2018-06-03 0:08 ` [Qemu-devel] [PATCH 5/8] hw/sd/ssi-sd: Force cards connected in SPI mode to use Spec v1.10 Philippe Mathieu-Daudé
2018-06-04 18:26 ` Alistair Francis
2018-06-07 16:31 ` [Qemu-devel] [Qemu-arm] " Philippe Mathieu-Daudé
2018-06-03 0:08 ` [Qemu-devel] [PATCH 6/8] sdcard: Disable SEND_IF_COND (CMD8) for Spec v1 Philippe Mathieu-Daudé
2018-06-04 15:42 ` Paolo Bonzini
2018-06-03 0:08 ` [Qemu-devel] [PATCH 7/8] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR) Philippe Mathieu-Daudé
2018-06-04 22:41 ` Alistair Francis
2018-06-03 0:08 ` [Qemu-devel] [PATCH 8/8] sdcard: Disable CMD19/CMD23 for Spec v2 Philippe Mathieu-Daudé
2018-06-04 18:20 ` [Qemu-devel] [PATCH 0/8] sdcard: cleanup the SD_SPEC version Alistair Francis
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=20180603000827.30872-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=alistair@alistair23.me \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@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).