openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/sd.c: Fix erase for high capacity cards 

Standard capacity cards SDSC use byte unit address while SDHC and SDXC cards use
block unit address (512 bytes) when setting ERASE_START and ERASE_END with CMD32
and CMD33, we have to account for this.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Igor Mitsyanko 2012-10-30 07:45:12 +00:00 committed by Peter Maydell
parent fc5b64d082
commit f2d189d384
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/sd.c
View File

@ -476,19 +476,28 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
static void sd_erase(SDState *sd) static void sd_erase(SDState *sd)
{ {
int i, start, end; int i;
uint64_t erase_start = sd->erase_start;
uint64_t erase_end = sd->erase_end;
if (!sd->erase_start || !sd->erase_end) { if (!sd->erase_start || !sd->erase_end) {
sd->card_status |= ERASE_SEQ_ERROR; sd->card_status |= ERASE_SEQ_ERROR;
return; return;
} }
start = sd_addr_to_wpnum(sd->erase_start); if (extract32(sd->ocr, OCR_CCS_BITN, 1)) {
end = sd_addr_to_wpnum(sd->erase_end); /* High capacity memory card: erase units are 512 byte blocks */
erase_start *= 512;
erase_end *= 512;
}
erase_start = sd_addr_to_wpnum(erase_start);
erase_end = sd_addr_to_wpnum(erase_end);
sd->erase_start = 0; sd->erase_start = 0;
sd->erase_end = 0; sd->erase_end = 0;
sd->csd[14] |= 0x40; sd->csd[14] |= 0x40;
for (i = start; i <= end; i++) { for (i = erase_start; i <= erase_end; i++) {
if (test_bit(i, sd->wp_groups)) { if (test_bit(i, sd->wp_groups)) {
sd->card_status |= WP_ERASE_SKIP; sd->card_status |= WP_ERASE_SKIP;
} }

1
hw/sd.h
View File

@ -50,6 +50,7 @@
#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_none = -1, sd_none = -1,