izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Implement SPI R2 return value

Browse Source 
In SPI mode, R2 is a 2-byte value.
Implement in spi_response_r2_make() and
return SPI R2 in the SEND_STATUS commands.

Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: 775616c3ae ("Partial SD card SPI mode support")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250804133406.17456-6-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
2025-08-05 16:05:56 +02:00
parent 1585ab9f1b
commit 0f2ff99479
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hw/sd/sd.c
+35 -3
View File
@@ -61,6 +61,7 @@
typedef enum {
sd_r0 = 0, /* no response */
sd_r1, /* normal response command */
spi_r2, /* STATUS */
sd_r2_i, /* CID register */
sd_r2_s, /* CSD register */
sd_r3, /* OCR register */
@@ -247,6 +248,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
static const char *response_name[] = {
[sd_r0] = "RESP#0 (no response)",
[sd_r1] = "RESP#1 (normal cmd)",
[spi_r2] = "RESP#2 (STATUS reg)",
[sd_r2_i] = "RESP#2 (CID reg)",
[sd_r2_s] = "RESP#2 (CSD reg)",
[sd_r3] = "RESP#3 (OCR reg)",
@@ -736,6 +738,10 @@ static size_t sd_response_size(SDState *sd, sd_rsp_type_t rtype)
case sd_r1b:
return sd_is_spi(sd) ? 1 : 4;
case spi_r2:
assert(sd_is_spi(sd));
return 2;
case sd_r2_i:
case sd_r2_s:
assert(!sd_is_spi(sd));
@@ -778,6 +784,22 @@ static void sd_response_r1_make(SDState *sd, uint8_t *response)
sd->card_status &= ~CARD_STATUS_C;
}
static void spi_response_r2_make(SDState *sd, uint8_t *resp)
{
/* Prepend R1 */
sd_response_r1_make(sd, resp);
resp[1] = FIELD_EX32(sd->card_status, CSR, CARD_IS_LOCKED) << 0;
resp[1] |= (FIELD_EX32(sd->card_status, CSR, LOCK_UNLOCK_FAILED)
|| FIELD_EX32(sd->card_status, CSR, WP_ERASE_SKIP)) << 1;
resp[1] |= FIELD_EX32(sd->card_status, CSR, ERROR) << 2;
resp[1] |= FIELD_EX32(sd->card_status, CSR, CC_ERROR) << 3;
resp[1] |= FIELD_EX32(sd->card_status, CSR, CARD_ECC_FAILED) << 4;
resp[1] |= FIELD_EX32(sd->card_status, CSR, WP_VIOLATION) << 5;
resp[1] |= FIELD_EX32(sd->card_status, CSR, ERASE_PARAM) << 6;
resp[1] |= FIELD_EX32(sd->card_status, CSR, OUT_OF_RANGE) << 7;
}
static void sd_response_r3_make(SDState *sd, uint8_t *response)
{
if (sd_is_spi(sd)) {
@@ -1643,7 +1665,7 @@ static sd_rsp_type_t sd_cmd_SEND_STATUS(SDState *sd, SDRequest req)
}
if (sd_is_spi(sd)) {
return sd_r2_s;
return spi_r2;
}
return sd_req_rca_same(sd, req) ? sd_r1 : sd_r0;
@@ -1957,8 +1979,14 @@ static sd_rsp_type_t sd_acmd_SET_BUS_WIDTH(SDState *sd, SDRequest req)
/* ACMD13 */
static sd_rsp_type_t sd_acmd_SD_STATUS(SDState *sd, SDRequest req)
{
return sd_cmd_to_sendingdata(sd, req, 0,
sd->sd_status, sizeof(sd->sd_status));
sd_rsp_type_t rsp;
rsp = sd_cmd_to_sendingdata(sd, req, 0,
sd->sd_status, sizeof(sd->sd_status));
if (sd_is_spi(sd) && rsp != sd_illegal) {
return spi_r2;
}
return rsp;
}
/* ACMD22 */
@@ -2264,6 +2292,10 @@ send_response:
sd_response_r1_make(sd, response);
break;
case spi_r2:
spi_response_r2_make(sd, response);
break;
case sd_r2_i:
memcpy(response, sd->cid, sizeof(sd->cid));
break;
hw/sd/ssi-sd.c
-3
View File
@@ -158,9 +158,6 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)
longresp, sizeof(longresp));
DPRINTF("CMD%d arg 0x%08x = %d\n", s->cmd, request.arg, s->arglen);
assert(s->arglen > 0);
/* CMD13 returns a 2-byte statuse work. Other commands
only return the first byte. */
s->arglen = (s->cmd == 13) ? 2 : 1;
memcpy(s->response, longresp, s->arglen);
/* handle R1b (busy signal) */