[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 13/19] hw/sd/sdcard: Adapt sd_cmd_APP_CMD handler for eMMC (C
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 13/19] hw/sd/sdcard: Adapt sd_cmd_APP_CMD handler for eMMC (CMD55) |
Date: |
Thu, 27 Jun 2024 19:10:53 +0200 |
From: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
[PMD: Use aspeed_emmc_kludge]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index f875fcd741..82e0b5838f 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1693,6 +1693,9 @@ static sd_rsp_type_t sd_cmd_APP_CMD(SDState *sd,
SDRequest req)
case sd_sleep_state:
return sd_invalid_state_for_cmd(sd, req);
case sd_idle_state:
+ if (sd_is_emmc(sd)) {
+ return sd_invalid_state_for_cmd(sd, req);
+ }
if (!sd_is_spi(sd) && sd_req_get_rca(sd, req) != 0x0000) {
qemu_log_mask(LOG_GUEST_ERROR,
"SD: illegal RCA 0x%04x for APP_CMD\n", req.cmd);
@@ -1707,7 +1710,7 @@ static sd_rsp_type_t sd_cmd_APP_CMD(SDState *sd,
SDRequest req)
sd->expecting_acmd = true;
sd->card_status |= APP_CMD;
- return sd_r1;
+ return sd->aspeed_emmc_kludge ? sd_r0 : sd_r1;
}
/* CMD56 */
--
2.41.0
- [PATCH 02/19] hw/sd/sdcard: Cover more SDCardStates, (continued)
- [PATCH 02/19] hw/sd/sdcard: Cover more SDCardStates, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 03/19] hw/sd/sdcard: Basis for eMMC support, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 04/19] hw/sd/sdcard: Register generic command handlers, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 05/19] hw/sd/sdcard: Register unimplemented command handlers, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 06/19] hw/sd/sdcard: Add emmc_cmd_SET_RELATIVE_ADDR() handler, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 07/19] hw/sd/sdcard: Add emmc_cmd_SEND_OP_COND handler (CMD1), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 08/19] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 09/19] hw/sd/sdcard: Add mmc_cmd_PROGRAM_CID handler (CMD26), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 10/19] hw/sd/sdcard: Implement eMMC sleep state (CMD5), Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 11/19] hw/sd/sdcard: Add experimental 'x-aspeed-emmc-kludge' property, Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 13/19] hw/sd/sdcard: Adapt sd_cmd_APP_CMD handler for eMMC (CMD55),
Philippe Mathieu-Daudé <=
- [RFC PATCH 12/19] hw/sd/sdcard: Adapt sd_cmd_ALL_SEND_CID handler for eMMC (CMD2), Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 14/19] hw/sd/sdcard: Add emmc_cmd_SEND_EXT_CSD handler (CMD8), Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 15/19] hw/sd/sdcard: add emmc_cmd_SEND_TUNING_BLOCK handler (CMD21), Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 16/19] hw/sd/sdcard: Add mmc SWITCH function support (CMD6), Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 17/19] hw/sd/sdcard: Support boot area in emmc image, Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 18/19] hw/sd/sdcard: Subtract bootarea size from blk, Philippe Mathieu-Daudé, 2024/06/27
- [RFC PATCH 19/19] hw/sd/sdcard: Add boot config support, Philippe Mathieu-Daudé, 2024/06/27
- Re: [PATCH 00/19] hw/sd: Add support for eMMC cards, Cédric Le Goater, 2024/06/28