From nobody Sun Nov 16 02:30:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1744192989; cv=none; d=zohomail.com; s=zohoarc; b=HkBkqoZ3OabrjpeBPFzgSawdjlLRD0wqQJu8if8BAKSZprM5sdjz9mNn7b7JthoNSic0LA8AAkVS2gZPosbtALUE7SeyAChA9aLlUrS8BBdIPh/Qb8bhorc35d1AGU9jXSsRg1KtEosCKdCQg3i3b7igjnsEwfJb2ODqSxQ0zEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744192989; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=CLIFVfL/nitJqiJHHsKGiq0+8hWaRbOQrV4MP7ew1iU=; b=lUpDEUtE9ubAXJxJSkWSZ6fJqxq6MZ6Eefi2RA5xITyJ7eSw7sJRyMugALfTF+PQ1/xkDwu6x0qAKPsdZfMUiEOqr6XiG4x8vSnH9IdwVPeKURKzkDmxYOKP93vRKa1A9JlCNH4vGiAUrtO1BwWhQ9AoyN+oObZ2byuTseWDwaM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1744192989930554.3804693053322; Wed, 9 Apr 2025 03:03:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2SF1-0006pl-KI; Wed, 09 Apr 2025 06:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2SEz-0006jW-2b; Wed, 09 Apr 2025 06:01:05 -0400 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2SEx-0006jO-Ar; Wed, 09 Apr 2025 06:01:04 -0400 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 9 Apr 2025 18:00:40 +0800 Received: from mail.aspeedtech.com (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Wed, 9 Apr 2025 18:00:40 +0800 To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Andrew Jeffery , "Joel Stanley" , "open list:All patches CC here" , "open list:ASPEED BMCs" CC: , , Subject: [PATCH v1 5/9] hw/arm/aspeed: Reuse rom_size variable for vbootrom setup Date: Wed, 9 Apr 2025 18:00:33 +0800 Message-ID: <20250409100039.2391847-6-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250409100039.2391847-1-jamin_lin@aspeedtech.com> References: <20250409100039.2391847-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jamin Lin From: Jamin Lin via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1744192991079019000 Content-Type: text/plain; charset="utf-8" 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 --- 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 =3D NULL; + uint64_t rom_size; bool boot_emmc; =20 bmc->soc =3D ASPEED_SOC(object_new(amc->soc_name)); @@ -475,7 +476,7 @@ static void aspeed_machine_init(MachineState *machine) BlockBackend *fmc0 =3D dev ? m25p80_get_blk(dev) : NULL; =20 if (fmc0 && !boot_emmc) { - uint64_t rom_size =3D memory_region_size(&bmc->soc->spi_boot); + rom_size =3D 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); --=20 2.43.0