From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:504:17c4:b0:1be9:327d:8ee3 with SMTP id o4csp2858486njd; Wed, 23 Apr 2025 00:25:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOtdVlyE4fKjJfD/MywfKjdxExExHujXU7i3NhKvTdhy4dYH9CGcAmUhvnlBfOw/Qad4a7gSl6fDgwkg==@linaro.org X-Google-Smtp-Source: AGHT+IHIxG4N9wXAAW4U+D19gp2BtczciYGOxVx/srptTfDDnOX3lo5xyKzueVEeLdYxwJDsLFBk X-Received: by 2002:a05:622a:589:b0:476:b2be:5894 with SMTP id d75a77b69052e-47aec3d08e4mr340564701cf.13.1745393128303; Wed, 23 Apr 2025 00:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745393128; cv=none; d=google.com; s=arc-20240605; b=XGlP8NnnTEMwXDrASoLG5+AYtbI3+rcAOdcZ8lVOI1fqYOHljryv7cHlq1hesP8wWM HiI8CnhR+XYKdpqocKM2OOb4mRE70T+B06kzI1XxUqXPS7MNuMiFo3yG/pHvdFEqhQod sXg/YdRixuBxBDFGu8tjxk6/MYKY9DbsRWVfqxw95c80ZhAQH12xUZpunTd41nDRvhzT w1vRNNoz38PLvBZsd23uhJixLRXdFFPSOigcqqSM8B4WPMq02lBtPa/WYoaEmqUkT1zx hQWqdAOLfkHHXK3Wcoj7GZa4/N1afkjeaUFrjUjuaRYtAuAMx+jdH1lDHYePFHp76bmg u/Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:from:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to; bh=rIqKqdXEUYWw2RvL5RnfBLlX3LrPz20OBL5zsEWCNhY=; fh=9slMQvAVAaDbZF94sUZsatNqTIKawFKtbOHuc7HAk0w=; b=XP8v32AXprsIr0U9/Pmp0JPTb5YlRUBngihU8Eq6mMJLKtiRQ2+uzH8xEE8lFH74kT 0OZHN2EIumXaoksUQIA8glWe6SkXcDtJrfDS/DNeSkw/dUCAoGthKP8+VqKXieJoxx5C 1qeev1Vjpktpd4F0/MCv8ki01yVFEgbSTLSIqZGBrlGqeQp3oMXbXC+JKueds7EiRkFL Of+TL3gWIx0NF+O4we9OVu3oPz6Q1DddSOEWAMvJqPe+2wGo8eFduO4OersB46pldIK9 zsQZepY9TWcuFR3bYIiVsOZHUbgbWWNFw4WoNvOxMZGj+3o5mvYjXrnP9phP5ING6ddL OW2g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ae9ca3aacsi129853181cf.271.2025.04.23.00.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 00:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7UTI-0002gW-2p; Wed, 23 Apr 2025 03:24:41 -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 1u7UTF-0002fF-5A; Wed, 23 Apr 2025 03:24:37 -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 1u7UTD-0001IR-HM; Wed, 23 Apr 2025 03:24:36 -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.1748.10; Wed, 23 Apr 2025 15:23:52 +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.1748.10 via Frontend Transport; Wed, 23 Apr 2025 15:23:52 +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 v5 06/11] hw/arm/aspeed: Add support for loading vbootrom image via "-bios" Date: Wed, 23 Apr 2025 15:23:42 +0800 Message-ID: <20250423072350.541742-7-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250423072350.541742-1-jamin_lin@aspeedtech.com> References: <20250423072350.541742-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: 98eFigaacgHu Introduce "aspeed_load_vbootrom()" to support loading a virtual boot ROM image into the vbootrom memory region, using the "-bios" command-line option. Signed-off-by: Jamin Lin Reviewed-by: Nabih Estefan Tested-by: Nabih Estefan --- hw/arm/aspeed.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index b70a120e62..b5831ef4c1 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -27,6 +27,7 @@ #include "system/reset.h" #include "hw/loader.h" #include "qemu/error-report.h" +#include "qemu/datadir.h" #include "qemu/units.h" #include "hw/qdev-clock.h" #include "system/system.h" @@ -305,6 +306,35 @@ static void aspeed_install_boot_rom(AspeedMachineState *bmc, BlockBackend *blk, rom_size, &error_abort); } +#define VBOOTROM_FILE_NAME "ast27x0_bootrom.bin" + +/* + * This function locates the vbootrom image file specified via the command line + * using the -bios option. It loads the specified image into the vbootrom + * memory region and handles errors if the file cannot be found or loaded. + */ +static void aspeed_load_vbootrom(MachineState *machine, uint64_t rom_size, + Error **errp) +{ + AspeedMachineState *bmc = ASPEED_MACHINE(machine); + const char *bios_name = machine->firmware ?: VBOOTROM_FILE_NAME; + g_autofree char *filename = NULL; + AspeedSoCState *soc = bmc->soc; + int ret; + + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!filename) { + error_setg(errp, "Could not find vbootrom image '%s'", bios_name); + return; + } + + ret = load_image_mr(filename, &soc->vbootrom); + if (ret < 0) { + error_setg(errp, "Failed to load vbootrom image '%s'", bios_name); + return; + } +} + void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, unsigned int count, int unit0) { @@ -483,6 +513,11 @@ static void aspeed_machine_init(MachineState *machine) } } + if (amc->vbootrom) { + rom_size = memory_region_size(&bmc->soc->vbootrom); + aspeed_load_vbootrom(machine, rom_size, &error_abort); + } + arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo); } -- 2.43.0