mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/sdcard: Fix calculation of size when using eMMC boot partitions

Browse Source 
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 <clg@kaod.org>
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Fixes: c8cb19876d ("hw/sd/sdcard: Support boot area in emmc image")
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Jan Luebbe 2024-10-28 17:23:08 +01:00 committed by Cédric Le Goater
parent deb771d8f3
commit c078298301
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/sd/sd.c
View File

@ -834,7 +834,9 @@ static void sd_reset(DeviceState *dev)
sect = 0; sect = 0;
} }
size = sect << HWBLOCK_SHIFT; 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; sect = sd_addr_to_wpnum(size) + 1;