[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/32] sdcard: update the CSD CRC register regardless
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 18/32] sdcard: update the CSD CRC register regardless the CSD structure version |
Date: |
Thu, 22 Feb 2018 15:22:53 +0000 |
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>
---
hw/sd/sd.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index cc347ff782..110f2f1d0a 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -378,7 +378,6 @@ static void sd_set_csd(SDState *sd, uint64_t size)
sd->csd[13] = 0x20 | /* Max. write data block length */
((HWBLOCK_SHIFT << 6) & 0xc0);
sd->csd[14] = 0x00; /* File format group */
- sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1;
} else { /* SDHC */
size /= 512 * 1024;
size -= 1;
@@ -397,8 +396,8 @@ static void sd_set_csd(SDState *sd, uint64_t size)
sd->csd[12] = 0x0a;
sd->csd[13] = 0x40;
sd->csd[14] = 0x00;
- sd->csd[15] = 0x00;
}
+ sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1;
}
static void sd_set_rca(SDState *sd)
--
2.16.1
- [Qemu-devel] [PULL 11/32] sdcard: add a trace event for command responses, (continued)
- [Qemu-devel] [PULL 11/32] sdcard: add a trace event for command responses, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 13/32] sdcard: add more trace events, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 12/32] sdcard: replace fprintf() by qemu_hexdump(), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 14/32] sdcard: define SDMMC_CMD_MAX instead of using the magic '64', Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 17/32] sdcard: Don't always set the high capacity bit, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 19/32] sdcard: fix the 'maximum data transfer rate' to 25MHz, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 20/32] sdcard: clean the SCR register and add few comments, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 16/32] sdcard: use the registerfields API to access the OCR register, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 15/32] sdcard: use G_BYTE from cutils, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 21/32] sdcard: remove commands from unsupported old MMC specification, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 18/32] sdcard: update the CSD CRC register regardless the CSD structure version,
Peter Maydell <=
- [Qemu-devel] [PULL 23/32] sdcard: use the correct masked OCR in the R3 reply, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 22/32] sdcard: simplify using the ldst API, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 25/32] sdcard: handle CMD54 (SDIO), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 24/32] sdcard: use the registerfields API for the CARD_STATUS register masks, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 26/32] sdcard: handle the Security Specification commands, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 28/32] sdcard: handles more commands in SPI mode, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 29/32] sdcard: check the card is in correct state for APP CMD (CMD55), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 32/32] sdcard: simplify SD_SEND_OP_COND (ACMD41), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 30/32] sdcard: warn if host uses an incorrect address for APP CMD (CMD55), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 31/32] sdcard: simplify SEND_IF_COND (CMD8), Peter Maydell, 2018/02/22