From: Cédric Le Goater <clg@kaod.org>
Date: Tue, 11 May 2021 11:58:47 +0000 (+0200)
Subject: hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7851548485671a7dc298cdf9fbcd852b08572fd4;p=qemu.git

hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23)

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>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240712162719.88165-6-philmd@linaro.org>
---

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index ab502d19b8..09077f0154 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;