[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/31] sdcard: Reflect when the Spec v3 is supported
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 30/31] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR) |
Date: |
Fri, 8 Jun 2018 13:45:16 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <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 7c6ad3c8f14..b865aafc336 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 3ec0f71f240..4e49a3827a3 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] [PULL 02/31] aspeed: remove ignore_memory_transaction_failures on all boards, (continued)
- [Qemu-devel] [PULL 02/31] aspeed: remove ignore_memory_transaction_failures on all boards, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 07/31] misc: add pca9552 LED blinker model, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 17/31] xilinx-dp: Add trailing '\n' to qemu_log() call, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 15/31] hw/sd/milkymist-memcard: Add trailing '\n' to qemu_log() call, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 01/31] arm_gicv3_kvm: kvm_dist_get/put: skip the registers banked by GICR, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 20/31] hw/mips/boston: Add trailing '\n' to qemu_log() calls, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 21/31] stellaris: Add trailing '\n' to qemu_log() calls, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 24/31] RISC-V: Add trailing '\n' to qemu_log() calls, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 26/31] sdcard: Update the Configuration Register (SCR) to Spec Version 1.10, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 29/31] sdcard: Disable SEND_IF_COND (CMD8) for Spec v1, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 30/31] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR),
Peter Maydell <=
- [Qemu-devel] [PULL 19/31] hw/core/register: Add trailing '\n' to qemu_log() call, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 27/31] sdcard: Allow commands valid in SPI mode, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 23/31] target/m68k: Add trailing '\n' to qemu_log() call, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 31/31] sdcard: Disable CMD19/CMD23 for Spec v2, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 22/31] target/arm: Add trailing '\n' to qemu_log() calls, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 25/31] target/xtensa: Add trailing '\n' to qemu_log() calls, Peter Maydell, 2018/06/08
- [Qemu-devel] [PULL 28/31] sdcard: Add a 'spec_version' property, default to Spec v2.00, Peter Maydell, 2018/06/08
- Re: [Qemu-devel] [PULL 00/31] target-arm queue, Peter Maydell, 2018/06/11