Skip to contentSkip to conversation

aspeed/sdmc: Check RAM size value at realize time

PATCH Applied Cédric Le Goater 3 participants 3 messages Jun 25, 2024 – Jul 2, 2024 Arm/Aspeed machine support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 aspeed/sdmc: Check RAM size value at realize time

The RAM size of the SDMC device is validated for the SoC and set when the Aspeed machines are initialized and then later used by several SoC implementations. However, the SDMC model never checks that the RAM size has been actually set before being used. Do that at realize.

---
 hw/misc/aspeed_sdmc.c | 6 ++++++
 1 file changed, 6 insertions(+)
hw/misc/aspeed_sdmc.c +6 -0
index 94eed9264d09..ebf139cb5c91 100644
@@ -271,6 +271,12 @@ static void aspeed_sdmc_realize(DeviceState *dev, Error **errp)
     AspeedSDMCClass *asc = ASPEED_SDMC_GET_CLASS(s);
 
     assert(asc->max_ram_size < 4 * GiB || asc->is_bus64bit);
+
+    if (!s->ram_size) {
+        error_setg(errp, "RAM size is not set");
+        return;
+    }
+
     s->max_ram_size = asc->max_ram_size;
 
     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_sdmc_ops, s,
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 37 lines

-----Original Message-----
From: Cédric Le Goater <[email protected]>
Sent: Tuesday, June 25, 2024 2:59 PM
To: [email protected]; [email protected]
Cc: Peter Maydell <[email protected]>; Joel Stanley <[email protected]>; Andrew Jeffery <[email protected]>; Jamin Lin <[email protected]>; Cédric Le Goater <[email protected]>
Subject: [PATCH] aspeed/sdmc: Check RAM size value at realize time

The RAM size of the SDMC device is validated for the SoC and set when the Aspeed machines are initialized and then later used by several SoC implementations. However, the SDMC model never checks that the RAM size has been actually set before being used. Do that at realize.

---
 hw/misc/aspeed_sdmc.c | 6 ++++++
 1 file changed, 6 insertions(+)
hw/misc/aspeed_sdmc.c index renamed from hw/misc/aspeed_sdmc.c +0 -0

94eed9264d09..ebf139cb5c91 100644

hw/misc/aspeed_sdmc.c +6 -0
@@ -271,6 +271,12 @@ static void aspeed_sdmc_realize(DeviceState *dev,
 Error **errp)
     AspeedSDMCClass *asc = ASPEED_SDMC_GET_CLASS(s);
 
     assert(asc->max_ram_size < 4 * GiB || asc->is_bus64bit);
+
+    if (!s->ram_size) {
+        error_setg(errp, "RAM size is not set");
+        return;
+    }
+
     s->max_ram_size = asc->max_ram_size;
 
     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_sdmc_ops, s,
Quoted 2 lines

--
2.45.2

Thanks-Jamin

#2 lore raw
In reply to Cédric Le Goater
Quoted 6 lines · Cédric Le Goater

The RAM size of the SDMC device is validated for the SoC and set when the Aspeed machines are initialized and then later used by several SoC implementations. However, the SDMC model never checks that the RAM size has been actually set before being used. Do that at realize.

Applied to aspeed-next.

Thanks,

C.

Quoted 21 lines
---
  hw/misc/aspeed_sdmc.c | 6 ++++++
  1 file changed, 6 insertions(+)
hw/misc/aspeed_sdmc.c +6 -0
index 94eed9264d09..ebf139cb5c91 100644
@@ -271,6 +271,12 @@ static void aspeed_sdmc_realize(DeviceState *dev, Error **errp)
      AspeedSDMCClass *asc = ASPEED_SDMC_GET_CLASS(s);
 
      assert(asc->max_ram_size < 4 * GiB || asc->is_bus64bit);
+
+    if (!s->ram_size) {
+        error_setg(errp, "RAM size is not set");
+        return;
+    }
+
      s->max_ram_size = asc->max_ram_size;
 
      memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_sdmc_ops, s,