[PULL,02/10] hw/sd/sdcard: Fix calculation of size when using eMMC boot partitions

Commit Message

Cédric Le Goater Nov. 4, 2024, 10:14 a.m. UTC

From: Jan Luebbe <[e-mail]>

The sd_bootpart_offset() function calculates the *runtime* offset which
changes as the guest switches between accessing the main user data area
and the boot partitions by writing to the EXT_CSD_PART_CONFIG_ACC_MASK
bits, so it shouldn't be used to calculate the main user data area size.

Instead, subtract the boot_part_size directly (twice, as there are two
identical boot partitions defined by the eMMC spec).

Suggested-by: Cédric Le Goater <[e-mail]>
Signed-off-by: Jan Luebbe <[e-mail]>
Fixes: c8cb19876d3e ("hw/sd/sdcard: Support boot area in emmc image")
Tested-by: Guenter Roeck <[e-mail]>
Reviewed-by: Cédric Le Goater <[e-mail]>
---
 hw/sd/sd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index b2e2d58e013e..f9bd03f3fd9e 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -834,7 +834,9 @@  static void sd_reset(DeviceState *dev)
         sect = 0;
     }
     size = sect << HWBLOCK_SHIFT;
-    size -= sd_bootpart_offset(sd);
+    if (sd_is_emmc(sd)) {
+        size -= sd->boot_part_size * 2;
+    }
 
     sect = sd_addr_to_wpnum(size) + 1;