diff mbox series

[RFC,17/17] hw/sd: Subtract bootarea size from blk

Message ID 20220318132824.1134400-18-clg@kaod.org
State New
Headers show
Series hw/sd: Rework models for eMMC support | expand

Commit Message

Cédric Le Goater March 18, 2022, 1:28 p.m. UTC 
From: Joel Stanley <joel@jms.id.au>

The userdata size is derived from the file the user passes on the
command line, but we must take into account the boot areas.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/sd/sd.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index e975fcf18512..2ac721bea026 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -644,6 +644,7 @@  static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
 static void sd_reset(DeviceState *dev)
 {
     SDState *sd = SD_CARD(dev);
+    SDCardClass *sc = SD_CARD_GET_CLASS(sd);
     uint64_t size;
     uint64_t sect;
 
@@ -655,6 +656,11 @@  static void sd_reset(DeviceState *dev)
     }
     size = sect << 9;
 
+    if (sc->bootpart_offset) {
+        unsigned int boot_capacity = sd->ext_csd[EXT_CSD_BOOT_MULT] << 17;
+        size -= boot_capacity * 2;
+    }
+
     sect = sd_addr_to_wpnum(size) + 1;
 
     sd->state = sd_idle_state;