[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] sdcard: Reflect when the Spec v3 is supporte
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 5/7] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR) |
Date: |
Thu, 7 Jun 2018 15:06:39 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
include/hw/sd/sd.h | 1 +
hw/sd/sd.c | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index 7c6ad3c8f1..b865aafc33 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -57,6 +57,7 @@
enum SDPhySpecificationVersion {
SD_PHY_SPECv1_10_VERS = 1,
SD_PHY_SPECv2_00_VERS = 2,
+ SD_PHY_SPECv3_01_VERS = 3,
};
typedef enum {
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 3ec0f71f24..4e49a3827a 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -316,11 +316,14 @@ static void sd_set_scr(SDState *sd)
if (sd->spec_version == SD_PHY_SPECv1_10_VERS) {
sd->scr[0] |= 1; /* Spec Version 1.10 */
} else {
- sd->scr[0] |= 2; /* Spec Version 2.00 */
+ sd->scr[0] |= 2; /* Spec Version 2.00 or Version 3.0X */
}
sd->scr[1] = (2 << 4) /* SDSC Card (Security Version 1.01) */
| 0b0101; /* 1-bit or 4-bit width bus modes */
sd->scr[2] = 0x00; /* Extended Security is not supported. */
+ if (sd->spec_version >= SD_PHY_SPECv3_01_VERS) {
+ sd->scr[2] |= 1 << 7; /* Spec Version 3.0X */
+ }
sd->scr[3] = 0x00;
/* reserved for manufacturer usage */
sd->scr[4] = 0x00;
@@ -2068,7 +2071,7 @@ static void sd_realize(DeviceState *dev, Error **errp)
switch (sd->spec_version) {
case SD_PHY_SPECv1_10_VERS
- ... SD_PHY_SPECv2_00_VERS:
+ ... SD_PHY_SPECv3_01_VERS:
break;
default:
error_setg(errp, "Invalid SD card Spec version: %u", sd->spec_version);
--
2.17.1
- [Qemu-devel] [PATCH v2 0/7] sdcard: cleanup the SD_SPEC version, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [PATCH v2 1/7] sdcard: Update the Configuration Register (SCR) to Spec Version 1.10, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [PATCH v2 2/7] sdcard: Allow commands valid in SPI mode, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [PATCH v2 3/7] sdcard: Add a 'spec_version' property, default to Spec v2.00, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [PATCH v2 4/7] sdcard: Disable SEND_IF_COND (CMD8) for Spec v1, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [PATCH v2 5/7] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 6/7] sdcard: Disable CMD19/CMD23 for Spec v2, Philippe Mathieu-Daudé, 2018/06/07
- [Qemu-devel] [RFC PATCH v2 7/7] hw/sd/ssi-sd: Force cards connected in SPI mode to use Spec v1.10, Philippe Mathieu-Daudé, 2018/06/07
- Re: [Qemu-devel] [PATCH v2 0/7] sdcard: cleanup the SD_SPEC version, Philippe Mathieu-Daudé, 2018/06/07
- Re: [Qemu-devel] [PATCH v2 0/7] sdcard: cleanup the SD_SPEC version, Peter Maydell, 2018/06/08