[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/19] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 08/19] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23) |
Date: |
Thu, 27 Jun 2024 19:10:48 +0200 |
From: Cédric Le Goater <clg@kaod.org>
The number of blocks is defined in the lower bits [15:0].
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 2dc0209482..7c6f5ccc72 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -171,12 +171,18 @@ struct SDState {
static void sd_realize(DeviceState *dev, Error **errp);
static const SDProto sd_proto_spi;
+static const SDProto sd_proto_emmc;
static bool sd_is_spi(SDState *sd)
{
return sd->proto == &sd_proto_spi;
}
+static bool sd_is_emmc(SDState *sd)
+{
+ return sd->proto == &sd_proto_emmc;
+}
+
static const char *sd_version_str(enum SDPhySpecificationVersion version)
{
static const char *sdphy_version[] = {
@@ -1479,6 +1485,9 @@ static sd_rsp_type_t sd_cmd_SET_BLOCK_COUNT(SDState *sd,
SDRequest req)
}
sd->multi_blk_cnt = req.arg;
+ if (sd_is_emmc(sd)) {
+ sd->multi_blk_cnt &= 0xffff;
+ }
trace_sdcard_set_block_count(sd->multi_blk_cnt);
return sd_r1;
--
2.41.0
- [PATCH 00/19] hw/sd: Add support for eMMC cards, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH 01/19] hw/sd/sdcard: Introduce set_csd/set_cid handlers, Philippe Mathieu-Daudé, 2024/06/27
- [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é <=
- [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é, 2024/06/27
- [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