qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH v3 07/18] sdcard: use the correct masked OCR in


From: Alistair Francis
Subject: Re: [Qemu-devel] [PATCH v3 07/18] sdcard: use the correct masked OCR in the R3 reply
Date: Wed, 31 Jan 2018 09:01:03 -0800

On Mon, Jan 22, 2018 at 7:30 PM, Philippe Mathieu-Daudé <address@hidden> wrote:
> use the registerfields API to access the OCR register
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  hw/sd/sd.c | 29 +++++++++++++++++++++++------
>  1 file changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 23f5d47782..ee381540aa 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -47,8 +47,6 @@
>
>  //#define DEBUG_SD 1
>
> -#define ACMD41_ENQUIRY_MASK     0x00ffffff
> -
>  typedef enum {
>      sd_r0 = 0,    /* no response */
>      sd_r1,        /* normal response command */
> @@ -271,13 +269,26 @@ static uint16_t sd_crc16(void *message, size_t width)
>
>  #define OCR_POWER_DELAY_NS      500000 /* 0.5ms */
>
> +FIELD(OCR, VDD_VOLTAGE_WINDOW,          0, 24)
> +FIELD(OCR, VDD_VOLTAGE_WIN_LO,          0,  8)
> +FIELD(OCR, DUAL_VOLTAGE_CARD,           7,  1)
> +FIELD(OCR, VDD_VOLTAGE_WIN_HI,          8, 16)
> +FIELD(OCR, ACCEPT_SWITCH_1V8,          24,  1) /* Only UHS-I */
> +FIELD(OCR, UHS_II_CARD,                29,  1) /* Only UHS-II */
>  FIELD(OCR, CARD_CAPACITY,              30,  1) /* 0:SDSC, 1:SDHC/SDXC */
>  FIELD(OCR, CARD_POWER_UP,              31,  1)
>
> +#define ACMD41_ENQUIRY_MASK     0x00ffffff
> +#define ACMD41_R3_MASK          (R_OCR_VDD_VOLTAGE_WIN_HI_MASK \
> +                               | R_OCR_ACCEPT_SWITCH_1V8_MASK \
> +                               | R_OCR_UHS_II_CARD_MASK \
> +                               | R_OCR_CARD_CAPACITY_MASK \
> +                               | R_OCR_CARD_POWER_UP_MASK)
> +
>  static void sd_reset_ocr(SDState *sd)
>  {
> -    /* All voltages OK, Standard Capacity SD Memory Card, not yet powered up 
> */
> -    sd->ocr = 0x00ffff00;
> +    /* All voltages OK */
> +    sd->ocr = R_OCR_VDD_VOLTAGE_WIN_HI_MASK;
>  }
>
>  static void sd_ocr_powerup(void *opaque)
> @@ -450,7 +461,7 @@ static void sd_response_r1_make(SDState *sd, uint8_t 
> *response)
>
>  static void sd_response_r3_make(SDState *sd, uint8_t *response)
>  {
> -    stl_be_p(response, sd->ocr);
> +    stl_be_p(response, sd->ocr & ACMD41_R3_MASK);
>  }
>
>  static void sd_response_r6_make(SDState *sd, uint8_t *response)
> @@ -1634,7 +1645,13 @@ send_response:
>      }
>
>  #ifdef DEBUG_SD
> -    qemu_hexdump((const char *)response, stderr, "Response", rsplen);
> +    if (rsplen) {
> +        int i;
> +        DPRINTF("Response:");
> +        for (i = 0; i < rsplen; i++)
> +            fprintf(stderr, " %02x", response[i]);
> +        fputc('\n', stderr);
> +    }
>  #endif
>
>      return rsplen;
> --
> 2.15.1
>
>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]