qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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, "Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH v3 04/10] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup
Date: Wed, 16 Apr 2025 11:43:19 +0800	[thread overview]
Message-ID: <20250416034327.315714-5-jamin_lin@aspeedtech.com> (raw)
In-Reply-To: <20250416034327.315714-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>
Reviewed-by: Cédric Le Goater <clg@redhat.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



  parent reply	other threads:[~2025-04-16  3:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-16  3:43 [PATCH v3 00/10] Support vbootrom for AST2700 Jamin Lin via
2025-04-16  3:43 ` [PATCH v3 01/10] hw/arm/aspeed_ast27x0: Rename variable sram_name to name in ast2700 realize Jamin Lin via
2025-04-16 20:24   ` Nabih Estefan
2025-04-16  3:43 ` [PATCH v3 02/10] hw/arm/aspeed_ast27x0 Introduce vbootrom memory region Jamin Lin via
2025-04-16 20:24   ` Nabih Estefan
2025-04-16  3:43 ` [PATCH v3 03/10] hw/arm/aspeed: Add vbootrom support on AST2700 EVB machines Jamin Lin via
2025-04-16 20:24   ` Nabih Estefan
2025-04-16  3:43 ` Jamin Lin via [this message]
2025-04-16 20:24   ` [PATCH v3 04/10] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup Nabih Estefan
2025-04-16  3:43 ` [PATCH v3 05/10] hw/arm/aspeed: Add support for loading vbootrom image via "-bios" Jamin Lin via
2025-04-16 20:24   ` Nabih Estefan
2025-04-17  2:32     ` Jamin Lin
2025-04-16  3:43 ` [PATCH v3 06/10] pc-bios: Add AST27x0 vBootrom Jamin Lin via
2025-04-16 20:23   ` Nabih Estefan
2025-04-17  2:29     ` Jamin Lin
2025-04-16  3:43 ` [PATCH v3 07/10] tests/functional/aspeed: Move I2C test into shared helper for AST2700 reuse Jamin Lin via
2025-04-16  3:43 ` [PATCH v3 08/10] tests/functional/aspeed: Update test ASPEED SDK v09.06 Jamin Lin via
2025-04-16  3:43 ` [PATCH v3 09/10] tests/functional/aspeed: Add to test vbootrom for AST2700 Jamin Lin via
2025-04-16  3:43 ` [PATCH v3 10/10] docs/system/arm/aspeed: Support " Jamin Lin via
2025-04-16 20:23   ` Nabih Estefan

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=20250416034327.315714-5-jamin_lin@aspeedtech.com \
    --to=qemu-devel@nongnu.org \
    --cc=andrew@codeconstruct.com.au \
    --cc=clg@kaod.org \
    --cc=clg@redhat.com \
    --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-arm@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).