[v47,07/19] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23)

Commit Message

Philippe Mathieu-Daudé July 9, 2024, 3:25 p.m. UTC

From: Cédric Le Goater <[e-mail]>

The number of blocks is defined in the lower bits [15:0].

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Signed-off-by: Cédric Le Goater <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Message-Id: <[e-mail]>
---
 hw/sd/sd.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 83d45c897f..216d4dfa89 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1533,6 +1533,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;