On Sat, Jun 2, 2018 at 5:08 PM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> include/hw/sd/sd.h | 1 +
> hw/sd/sd.c | 13 +++++++++----
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
> index 49f22b0b89..7c6ad3c8f1 100644
> --- a/include/hw/sd/sd.h
> +++ b/include/hw/sd/sd.h
> @@ -56,6 +56,7 @@
>
> enum SDPhySpecificationVersion {
> SD_PHY_SPECv1_10_VERS = 1,
> + SD_PHY_SPECv2_00_VERS = 2,
> };
>
> typedef enum {
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 5ddd211114..81f178b36e 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -311,8 +311,12 @@ static void sd_ocr_powerup(void *opaque)
>
> static void sd_set_scr(SDState *sd)
> {
> - sd->scr[0] = (0 << 4) /* SCR structure version 1.0 */
> - | 1; /* Spec Version 1.10 */
> + sd->scr[0] = 0 << 4; /* SCR structure version 1.0 */
> + 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[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. */
> @@ -2060,7 +2064,8 @@ 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:
> + case SD_PHY_SPECv1_10_VERS
> + ... SD_PHY_SPECv2_00_VERS:
> break;
> default:
> error_setg(errp, "Invalid SD card Spec version: %u",
> sd->spec_version);
> @@ -2084,7 +2089,7 @@ 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),
> + spec_version, SD_PHY_SPECv2_00_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
>
>
