From: Jamin Lin via <qemu-arm@nongnu.org>
To: "Cédric Le Goater" <clg@kaod.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Troy Lee" <leetroy@gmail.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Joel Stanley" <joel@jms.id.au>,
"open list:All patches CC here" <qemu-devel@nongnu.org>,
"open list:ASPEED BMCs" <qemu-arm@nongnu.org>
Cc: <jamin_lin@aspeedtech.com>, <troy_lee@aspeedtech.com>,
<nabihestefan@google.com>
Subject: [PATCH v2 06/10] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup
Date: Thu, 10 Apr 2025 10:38:50 +0800 [thread overview]
Message-ID: <20250410023856.500258-7-jamin_lin@aspeedtech.com> (raw)
In-Reply-To: <20250410023856.500258-1-jamin_lin@aspeedtech.com>
Move the declaration of `rom_size` to an outer scope in aspeed_machine_init()
so it can be reused for setting up the vbootrom region as well.
This avoids introducing a redundant local variable and ensures consistent
ROM sizing logic when both SPI boot and vbootrom are used.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
hw/arm/aspeed.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index e852bbc4cb..b70a120e62 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -381,6 +381,7 @@ static void aspeed_machine_init(MachineState *machine)
AspeedSoCClass *sc;
int i;
DriveInfo *emmc0 = NULL;
+ uint64_t rom_size;
bool boot_emmc;
bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
@@ -475,7 +476,7 @@ static void aspeed_machine_init(MachineState *machine)
BlockBackend *fmc0 = dev ? m25p80_get_blk(dev) : NULL;
if (fmc0 && !boot_emmc) {
- uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot);
+ rom_size = memory_region_size(&bmc->soc->spi_boot);
aspeed_install_boot_rom(bmc, fmc0, rom_size);
} else if (emmc0) {
aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(emmc0), 64 * KiB);
--
2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Jamin Lin via <qemu-devel@nongnu.org>
To: "Cédric Le Goater" <clg@kaod.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Troy Lee" <leetroy@gmail.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Joel Stanley" <joel@jms.id.au>,
"open list:All patches CC here" <qemu-devel@nongnu.org>,
"open list:ASPEED BMCs" <qemu-arm@nongnu.org>
Cc: <jamin_lin@aspeedtech.com>, <troy_lee@aspeedtech.com>,
<nabihestefan@google.com>
Subject: [PATCH v2 06/10] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup
Date: Thu, 10 Apr 2025 10:38:50 +0800 [thread overview]
Message-ID: <20250410023856.500258-7-jamin_lin@aspeedtech.com> (raw)
In-Reply-To: <20250410023856.500258-1-jamin_lin@aspeedtech.com>
Move the declaration of `rom_size` to an outer scope in aspeed_machine_init()
so it can be reused for setting up the vbootrom region as well.
This avoids introducing a redundant local variable and ensures consistent
ROM sizing logic when both SPI boot and vbootrom are used.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
hw/arm/aspeed.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index e852bbc4cb..b70a120e62 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -381,6 +381,7 @@ static void aspeed_machine_init(MachineState *machine)
AspeedSoCClass *sc;
int i;
DriveInfo *emmc0 = NULL;
+ uint64_t rom_size;
bool boot_emmc;
bmc->soc = ASPEED_SOC(object_new(amc->soc_name));
@@ -475,7 +476,7 @@ static void aspeed_machine_init(MachineState *machine)
BlockBackend *fmc0 = dev ? m25p80_get_blk(dev) : NULL;
if (fmc0 && !boot_emmc) {
- uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot);
+ rom_size = memory_region_size(&bmc->soc->spi_boot);
aspeed_install_boot_rom(bmc, fmc0, rom_size);
} else if (emmc0) {
aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(emmc0), 64 * KiB);
--
2.43.0
next prev parent reply other threads:[~2025-04-10 2:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-10 2:38 [PATCH v2 00/10] Support vbootrom for AST2700 Jamin Lin via
2025-04-10 2:38 ` [PATCH v2 01/10] hw/arm/aspeed: Introduced ASPEED_DEV_VBOOTROM in the device enumeration Jamin Lin via
2025-04-10 2:38 ` [PATCH v2 02/10] hw/arm/aspeed_ast27x0: Add "vbootrom_size" field to AspeedSoCClass Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via
2025-04-10 2:38 ` [PATCH v2 03/10] hw/arm/aspeed_ast27x0: Rename variable sram_name to name in ast2700 realize Jamin Lin via
2025-04-11 15:48 ` Cédric Le Goater
2025-04-10 2:38 ` [PATCH v2 04/10] hw/arm/aspeed_ast27x0 Introduce vbootrom memory region Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via
2025-04-11 15:50 ` Cédric Le Goater
2025-04-14 1:22 ` Jamin Lin
2025-04-10 2:38 ` [PATCH v2 05/10] hw/arm/aspeed: Enable vbootrom support by default on AST2700 EVB machines Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via [this message]
2025-04-10 2:38 ` [PATCH v2 06/10] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup Jamin Lin via
2025-04-11 15:50 ` Cédric Le Goater
2025-04-10 2:38 ` [PATCH v2 07/10] hw/arm/aspeed: Add support for loading vbootrom image via "-bios" Jamin Lin via
2025-04-11 16:07 ` Cédric Le Goater
2025-04-14 3:17 ` Jamin Lin
2025-04-14 21:14 ` Nabih Estefan
2025-04-15 9:34 ` Jamin Lin
2025-04-15 16:07 ` Nabih Estefan
2025-04-16 2:21 ` Jamin Lin
2025-04-10 2:38 ` [PATCH v2 08/10] pc-bios: Add AST27x0 vBootrom Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via
2025-04-11 15:58 ` Cédric Le Goater
2025-04-14 6:50 ` Jamin Lin
2025-04-21 16:31 ` Cédric Le Goater
2025-04-10 2:38 ` [PATCH v2 09/10] tests/functional/aspeed: Update AST2700 functional test to use vbootrom Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via
2025-04-11 15:54 ` Cédric Le Goater
2025-04-14 2:06 ` Jamin Lin
2025-04-10 2:38 ` [PATCH v2 10/10] docs/system/arm/aspeed: Support vbootrom for AST2700 Jamin Lin via
2025-04-10 2:38 ` Jamin Lin via
2025-04-11 15:48 ` [PATCH v2 00/10] " Cédric Le Goater
2025-04-14 1:20 ` Jamin Lin
2025-04-21 16:08 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250410023856.500258-7-jamin_lin@aspeedtech.com \
--to=qemu-arm@nongnu.org \
--cc=andrew@codeconstruct.com.au \
--cc=clg@kaod.org \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=leetroy@gmail.com \
--cc=nabihestefan@google.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=steven_lee@aspeedtech.com \
--cc=troy_lee@aspeedtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.