ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdcard: use the registerfields API to access the OCR register 

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180215220540.6556-12-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-02-22 15:12:52 +00:00 committed by Peter Maydell
parent 7af83490fe
commit 6f296421f8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/sd/sd.c
View File

@ -32,6 +32,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/registerfields.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "hw/sd/sd.h" #include "hw/sd/sd.h"
#include "qapi/error.h" #include "qapi/error.h"
@ -47,8 +48,6 @@
//#define DEBUG_SD 1 //#define DEBUG_SD 1
#define ACMD41_ENQUIRY_MASK 0x00ffffff #define ACMD41_ENQUIRY_MASK 0x00ffffff
#define OCR_POWER_UP 0x80000000
#define OCR_POWER_DELAY_NS 500000 /* 0.5ms */
typedef enum { typedef enum {
sd_r0 = 0, /* no response */ sd_r0 = 0, /* no response */
@ -271,6 +270,11 @@ static uint16_t sd_crc16(void *message, size_t width)
return shift_reg; return shift_reg;
} }
#define OCR_POWER_DELAY_NS 500000 /* 0.5ms */
FIELD(OCR, CARD_CAPACITY, 30, 1) /* 0:SDSC, 1:SDHC/SDXC */
FIELD(OCR, CARD_POWER_UP, 31, 1)
static void sd_set_ocr(SDState *sd) static void sd_set_ocr(SDState *sd)
{ {
/* All voltages OK, Standard Capacity SD Memory Card, not yet powered up */ /* All voltages OK, Standard Capacity SD Memory Card, not yet powered up */
@ -282,9 +286,10 @@ static void sd_ocr_powerup(void *opaque)
SDState *sd = opaque; SDState *sd = opaque;
trace_sdcard_powerup(); trace_sdcard_powerup();
/* Set powered up bit in OCR */ assert(!FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP));
assert(!(sd->ocr & OCR_POWER_UP));
sd->ocr |= OCR_POWER_UP; /* card power-up OK */
sd->ocr = FIELD_DP32(sd->ocr, OCR, CARD_POWER_UP, 1);
} }
static void sd_set_scr(SDState *sd) static void sd_set_scr(SDState *sd)
@ -570,7 +575,7 @@ static bool sd_ocr_vmstate_needed(void *opaque)
SDState *sd = opaque; SDState *sd = opaque;
/* Include the OCR state (and timer) if it is not yet powered up */ /* Include the OCR state (and timer) if it is not yet powered up */
return !(sd->ocr & OCR_POWER_UP); return !FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP);
} }
static const VMStateDescription sd_ocr_vmstate = { static const VMStateDescription sd_ocr_vmstate = {
@ -680,7 +685,7 @@ static void sd_erase(SDState *sd)
return; return;
} }
if (extract32(sd->ocr, OCR_CCS_BITN, 1)) { if (FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) {
/* High capacity memory card: erase units are 512 byte blocks */ /* High capacity memory card: erase units are 512 byte blocks */
erase_start *= 512; erase_start *= 512;
erase_end *= 512; erase_end *= 512;
@ -1468,7 +1473,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
* UEFI, which sends an initial enquiry ACMD41, but * UEFI, which sends an initial enquiry ACMD41, but
* assumes that the card is in ready state as soon as it * assumes that the card is in ready state as soon as it
* sees the power up bit set. */ * sees the power up bit set. */
if (!(sd->ocr & OCR_POWER_UP)) { if (!FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP)) {
if ((req.arg & ACMD41_ENQUIRY_MASK) != 0) { if ((req.arg & ACMD41_ENQUIRY_MASK) != 0) {
timer_del(sd->ocr_power_timer); timer_del(sd->ocr_power_timer);
sd_ocr_powerup(sd); sd_ocr_powerup(sd);

1
include/hw/sd/sd.h
View File

@ -53,7 +53,6 @@
#define READY_FOR_DATA (1 << 8) #define READY_FOR_DATA (1 << 8)
#define APP_CMD (1 << 5) #define APP_CMD (1 << 5)
#define AKE_SEQ_ERROR (1 << 3) #define AKE_SEQ_ERROR (1 << 3)
#define OCR_CCS_BITN 30
typedef enum { typedef enum {
SD_VOLTAGE_0_4V = 400, /* currently not supported */ SD_VOLTAGE_0_4V = 400, /* currently not supported */