From nobody Tue May 13 22:52:38 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
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=gmail.com
ARC-Seal: i=1; a=rsa-sha256; t=1734561678; cv=none;
d=zohomail.com; s=zohoarc;
b=inxahtHN9RtwiqVR1RPg+f6+GqSaQZ/L7tD7kvGFf9V/nQUdLWC2iD7lyeOScWLDzbkP7Zq3M0RCUikdPIEHk4x0Zb/HszTJKE87jAq9Tj/a2p8INTY7SfGwoBaeS3SvSwvuh7ruONEHOZBypizcd/s+2mDZRyNlCG4BB+SvUWI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734561678;
h=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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
bh=if0t+RynGyy+jWaLxcCbDUoikewpbbgwcODeBNI/aRM=;
b=aTFwrYAocaUOtxQXCRdm8stwtosxDdYTmcv//S95qcje4hrcKPTeu31itjkwoqaFkkNETlR4jQiFZyWPcYJkn2IVdxReXLo6aXhMs4dHbpc2/JdhntdQkF5aRd09JWddGtnUcj/3ROYkY5zOnSqPCPL1bscxpRgbJKgP9+1bKn4=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
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=<alistair23@gmail.com> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734561678535601.5358164368713;
Wed, 18 Dec 2024 14:41:18 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tO2bo-0005um-5T; Wed, 18 Dec 2024 17:33:36 -0500
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 <alistair23@gmail.com>)
id 1tO2Zy-0003iV-5L
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 17:31:44 -0500
Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <alistair23@gmail.com>)
id 1tO2Zv-0003Ke-Rz
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 17:31:41 -0500
Received: by mail-pl1-x62a.google.com with SMTP id
d9443c01a7336-2163dc5155fso1659285ad.0
for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 14:31:39 -0800 (PST)
Received: from toolbox.alistair23.me
(2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net.
[2403:580b:97e8:0:82ce:f179:8a79:69f4])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-219dc9705d7sm375775ad.102.2024.12.18.14.31.34
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 14:31:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734561098; x=1735165898; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=if0t+RynGyy+jWaLxcCbDUoikewpbbgwcODeBNI/aRM=;
b=m0M+cpw/GmKkJRcEjoXo0PxyG3PbibXAu/Y1N4RSl4wmQzmhd8RwikmJfDQAms9/cV
TjN1Qistdqnfpqq3xsHYNTQST++adYEmkqoclMywvirQ1WMcqgGL8VJ3+ABb3O33S5HD
DdF6bFBBsoY6rqzbs5jA/HNVdiZGGipqMtAGdA/myHgsnSWboulBbsP9kxTjXXPfCz0R
uRg47bC+CxzqSsw6EUaShS+fWaVaHIosoCKTn5pOATfao1wtF/EHqD6Etj68NcZiNZYA
bgeOz3oK8nVFPcG7ueJ2gvjBLsRA5JE+Nrbgd6AJAxKc8obh5f8TnrLdXitammotI5pM
z6qQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734561098; x=1735165898;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=if0t+RynGyy+jWaLxcCbDUoikewpbbgwcODeBNI/aRM=;
b=l0O9HIci0SSSKTaqemijnqKJiOaatVe5aghqcE/bWQxvN24YJzCvXvGa28Ph/QtOn/
tIYVtqTTOuew7k8qIeFDDTszeG7/0MYDISY335F5aNtB/SUTc2Z0octURXHiVh3P5tor
zPt6z4M0pS/7OJbL2ImarywrXRrKmOMXsWvmbTnxtaUVDIcCXT8QtFBkECmGErhzvbW4
TBEvyvZiTry34mCSrrmEbqsChedOgwyMKT1HewX9vuqAYcglRgXEDZjcgBv8N926pUXS
AZn2gAb5+OoCKQv2HsXknHc3Olf9jRO8kqznuLHhmeJs3A7y5k2DzfFokJKeDqmyij0f
ldjw==
X-Gm-Message-State: AOJu0YwZVLbvukH9A6OH1C+ek/zXKzH5AyJ5xiTrnbzpef3Cl6Pl4Fjk
SB1tBeAQh2mVZkpY/5CQ3i0juhHJ3BW8GezQlN6KV7KOkBcXsxTSOoVWbEZl
X-Gm-Gg: ASbGncsilxnDcEh6uC4YjwlM738/Q32rOJQwgCAUj3edke6o8JoZl44VeywSBq38IIk
lCkC+E0FLHbXSNMXXg8PCm/xp6exH+R6FMyfDY4YR0w/8d9f4kZjGkjlra2L9zlVtTOhQwH40Ti
Ar07OsJKPKEEHvdLNP9nATuhAeQJrXmbUZf9fdhGrWWkqgYSVzgq9+6cw0dYx6gM1XZnza5Jpk6
GXKdPkVe/zGSv2YrWqauG+1ZCwTRniNzO8hiugPxGGElw5yZ+N+Uweemnm0KUPSv0lwgjp1k3tX
kG4Lu8m+qLgdcUglgdTCHGTk9yG1caFRC0b92SBQnx6y2MmOm2AfSVe2GBLwYG0=
X-Google-Smtp-Source:
AGHT+IGASgbwteKuHzeGWameUwdTI+VeBlp3hKyiy1FMBwQUJJz7Xq8r5M4sBEgzRN8T5jto3hn/bg==
X-Received: by 2002:a17:902:d510:b0:216:60a3:b3fd with SMTP id
d9443c01a7336-218d6fca28fmr59652635ad.3.1734561097841;
Wed, 18 Dec 2024 14:31:37 -0800 (PST)
From: Alistair Francis <alistair23@gmail.com>
X-Google-Original-From: Alistair Francis <alistair.francis@wdc.com>
To: qemu-devel@nongnu.org
Cc: alistair23@gmail.com, Jim Shu <jim.shu@sifive.com>,
Alistair Francis <alistair.francis@wdc.com>,
Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Subject: [PULL 27/39] hw/riscv: Add a new struct RISCVBootInfo
Date: Thu, 19 Dec 2024 08:29:57 +1000
Message-ID: <20241218223010.1931245-28-alistair.francis@wdc.com>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20241218223010.1931245-1-alistair.francis@wdc.com>
References: <20241218223010.1931245-1-alistair.francis@wdc.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=2607:f8b0:4864:20::62a;
envelope-from=alistair23@gmail.com; helo=mail-pl1-x62a.google.com
X-Spam_score_int: -17
X-Spam_score: -1.8
X-Spam_bar: -
X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @gmail.com)
X-ZM-MESSAGEID: 1734561679310116600
Content-Type: text/plain; charset="utf-8"
From: Jim Shu <jim.shu@sifive.com>
Add a new struct RISCVBootInfo to sync boot information between multiple
boot functions.
Signed-off-by: Jim Shu <jim.shu@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-ID: <20241120153935.24706-3-jim.shu@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
include/hw/riscv/boot.h | 25 ++++++++++-----
hw/riscv/boot.c | 65 ++++++++++++++++++++++----------------
hw/riscv/microchip_pfsoc.c | 11 ++++---
hw/riscv/opentitan.c | 4 ++-
hw/riscv/sifive_e.c | 4 ++-
hw/riscv/sifive_u.c | 12 ++++---
hw/riscv/spike.c | 12 ++++---
hw/riscv/virt.c | 13 +++++---
8 files changed, 90 insertions(+), 56 deletions(-)
diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h
index 34a80c5ff4..06b51ed086 100644
--- a/include/hw/riscv/boot.h
+++ b/include/hw/riscv/boot.h
@@ -27,11 +27,20 @@
#define RISCV32_BIOS_BIN "opensbi-riscv32-generic-fw_dynamic.bin"
#define RISCV64_BIOS_BIN "opensbi-riscv64-generic-fw_dynamic.bin"
=20
+typedef struct RISCVBootInfo {
+ ssize_t kernel_size;
+ hwaddr image_low_addr;
+ hwaddr image_high_addr;
+
+ bool is_32bit;
+} RISCVBootInfo;
+
bool riscv_is_32bit(RISCVHartArrayState *harts);
=20
char *riscv_plic_hart_config_string(int hart_count);
=20
-target_ulong riscv_calc_kernel_start_addr(RISCVHartArrayState *harts,
+void riscv_boot_info_init(RISCVBootInfo *info, RISCVHartArrayState *harts);
+target_ulong riscv_calc_kernel_start_addr(RISCVBootInfo *info,
target_ulong firmware_end_addr);
target_ulong riscv_find_and_load_firmware(MachineState *machine,
const char *default_machine_firm=
ware,
@@ -43,13 +52,13 @@ char *riscv_find_firmware(const char *firmware_filename,
target_ulong riscv_load_firmware(const char *firmware_filename,
hwaddr *firmware_load_addr,
symbol_fn_t sym_cb);
-target_ulong riscv_load_kernel(MachineState *machine,
- RISCVHartArrayState *harts,
- target_ulong firmware_end_addr,
- bool load_initrd,
- symbol_fn_t sym_cb);
-uint64_t riscv_compute_fdt_addr(hwaddr dram_start, uint64_t dram_size,
- MachineState *ms, RISCVHartArrayState *har=
ts);
+void riscv_load_kernel(MachineState *machine,
+ RISCVBootInfo *info,
+ target_ulong kernel_start_addr,
+ bool load_initrd,
+ symbol_fn_t sym_cb);
+uint64_t riscv_compute_fdt_addr(hwaddr dram_base, hwaddr dram_size,
+ MachineState *ms, RISCVBootInfo *info);
void riscv_load_fdt(hwaddr fdt_addr, void *fdt);
void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState =
*harts,
hwaddr saddr,
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index d36d3a7104..81d27f935e 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -67,9 +67,15 @@ char *riscv_plic_hart_config_string(int hart_count)
return g_strjoinv(",", (char **)vals);
}
=20
-target_ulong riscv_calc_kernel_start_addr(RISCVHartArrayState *harts,
+void riscv_boot_info_init(RISCVBootInfo *info, RISCVHartArrayState *harts)
+{
+ info->kernel_size =3D 0;
+ info->is_32bit =3D riscv_is_32bit(harts);
+}
+
+target_ulong riscv_calc_kernel_start_addr(RISCVBootInfo *info,
target_ulong firmware_end_addr) {
- if (riscv_is_32bit(harts)) {
+ if (info->is_32bit) {
return QEMU_ALIGN_UP(firmware_end_addr, 4 * MiB);
} else {
return QEMU_ALIGN_UP(firmware_end_addr, 2 * MiB);
@@ -175,7 +181,7 @@ target_ulong riscv_load_firmware(const char *firmware_f=
ilename,
exit(1);
}
=20
-static void riscv_load_initrd(MachineState *machine, uint64_t kernel_entry)
+static void riscv_load_initrd(MachineState *machine, RISCVBootInfo *info)
{
const char *filename =3D machine->initrd_filename;
uint64_t mem_size =3D machine->ram_size;
@@ -196,7 +202,7 @@ static void riscv_load_initrd(MachineState *machine, ui=
nt64_t kernel_entry)
* halfway into RAM, and for boards with 1GB of RAM or more we put
* the initrd at 512MB.
*/
- start =3D kernel_entry + MIN(mem_size / 2, 512 * MiB);
+ start =3D info->image_low_addr + MIN(mem_size / 2, 512 * MiB);
=20
size =3D load_ramdisk(filename, start, mem_size - start);
if (size =3D=3D -1) {
@@ -215,14 +221,14 @@ static void riscv_load_initrd(MachineState *machine, =
uint64_t kernel_entry)
}
}
=20
-target_ulong riscv_load_kernel(MachineState *machine,
- RISCVHartArrayState *harts,
- target_ulong kernel_start_addr,
- bool load_initrd,
- symbol_fn_t sym_cb)
+void riscv_load_kernel(MachineState *machine,
+ RISCVBootInfo *info,
+ target_ulong kernel_start_addr,
+ bool load_initrd,
+ symbol_fn_t sym_cb)
{
const char *kernel_filename =3D machine->kernel_filename;
- uint64_t kernel_load_base, kernel_entry;
+ ssize_t kernel_size;
void *fdt =3D machine->fdt;
=20
g_assert(kernel_filename !=3D NULL);
@@ -234,21 +240,28 @@ target_ulong riscv_load_kernel(MachineState *machine,
* the (expected) load address load address. This allows kernels to ha=
ve
* separate SBI and ELF entry points (used by FreeBSD, for example).
*/
- if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL,
- NULL, &kernel_load_base, NULL, NULL, 0,
- EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
- kernel_entry =3D kernel_load_base;
+ kernel_size =3D load_elf_ram_sym(kernel_filename, NULL, NULL, NULL, NU=
LL,
+ &info->image_low_addr, &info->image_hig=
h_addr,
+ NULL, 0, EM_RISCV, 1, 0, NULL, true, sy=
m_cb);
+ if (kernel_size > 0) {
+ info->kernel_size =3D kernel_size;
goto out;
}
=20
- if (load_uimage_as(kernel_filename, &kernel_entry, NULL, NULL,
- NULL, NULL, NULL) > 0) {
+ kernel_size =3D load_uimage_as(kernel_filename, &info->image_low_addr,
+ NULL, NULL, NULL, NULL, NULL);
+ if (kernel_size > 0) {
+ info->kernel_size =3D kernel_size;
+ info->image_high_addr =3D info->image_low_addr + kernel_size;
goto out;
}
=20
- if (load_image_targphys_as(kernel_filename, kernel_start_addr,
- current_machine->ram_size, NULL) > 0) {
- kernel_entry =3D kernel_start_addr;
+ kernel_size =3D load_image_targphys_as(kernel_filename, kernel_start_a=
ddr,
+ current_machine->ram_size, NULL);
+ if (kernel_size > 0) {
+ info->kernel_size =3D kernel_size;
+ info->image_low_addr =3D kernel_start_addr;
+ info->image_high_addr =3D info->image_low_addr + kernel_size;
goto out;
}
=20
@@ -257,23 +270,21 @@ target_ulong riscv_load_kernel(MachineState *machine,
=20
out:
/*
- * For 32 bit CPUs 'kernel_entry' can be sign-extended by
+ * For 32 bit CPUs 'image_low_addr' can be sign-extended by
* load_elf_ram_sym().
*/
- if (riscv_is_32bit(harts)) {
- kernel_entry =3D extract64(kernel_entry, 0, 32);
+ if (info->is_32bit) {
+ info->image_low_addr =3D extract64(info->image_low_addr, 0, 32);
}
=20
if (load_initrd && machine->initrd_filename) {
- riscv_load_initrd(machine, kernel_entry);
+ riscv_load_initrd(machine, info);
}
=20
if (fdt && machine->kernel_cmdline && *machine->kernel_cmdline) {
qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
machine->kernel_cmdline);
}
-
- return kernel_entry;
}
=20
/*
@@ -293,7 +304,7 @@ out:
* The FDT is fdt_packed() during the calculation.
*/
uint64_t riscv_compute_fdt_addr(hwaddr dram_base, hwaddr dram_size,
- MachineState *ms, RISCVHartArrayState *har=
ts)
+ MachineState *ms, RISCVBootInfo *info)
{
int ret =3D fdt_pack(ms->fdt);
hwaddr dram_end, temp;
@@ -321,7 +332,7 @@ uint64_t riscv_compute_fdt_addr(hwaddr dram_base, hwadd=
r dram_size,
* Thus, put it near to the end of dram in RV64, and put it near to th=
e end
* of dram or 3GB whichever is lesser in RV32.
*/
- if (!riscv_is_32bit(harts)) {
+ if (!info->is_32bit) {
temp =3D dram_end;
} else {
temp =3D (dram_base < 3072 * MiB) ? MIN(dram_end, 3072 * MiB) : dr=
am_end;
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
index ba8b0a2c26..a302965b6d 100644
--- a/hw/riscv/microchip_pfsoc.c
+++ b/hw/riscv/microchip_pfsoc.c
@@ -521,6 +521,7 @@ static void microchip_icicle_kit_machine_init(MachineSt=
ate *machine)
uint64_t kernel_entry;
uint64_t fdt_load_addr;
DriveInfo *dinfo =3D drive_get(IF_SD, 0, 0);
+ RISCVBootInfo boot_info;
=20
/* Sanity check on RAM size */
if (machine->ram_size < mc->default_ram_size) {
@@ -615,17 +616,19 @@ static void microchip_icicle_kit_machine_init(Machine=
State *machine)
firmware_end_addr =3D riscv_find_and_load_firmware(machine, firmware_n=
ame,
&firmware_load_addr, =
NULL);
=20
+ riscv_boot_info_init(&boot_info, &s->soc.u_cpus);
if (kernel_as_payload) {
- kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc.u_cpus,
+ kernel_start_addr =3D riscv_calc_kernel_start_addr(&boot_info,
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, &s->soc.u_cpus,
- kernel_start_addr, true, NULL);
+ riscv_load_kernel(machine, &boot_info, kernel_start_addr,
+ true, NULL);
+ kernel_entry =3D boot_info.image_low_addr;
=20
/* Compute the fdt load address in dram */
fdt_load_addr =3D riscv_compute_fdt_addr(memmap[MICROCHIP_PFSOC_DR=
AM_LO].base,
memmap[MICROCHIP_PFSOC_DRAM=
_LO].size,
- machine, &s->soc.u_cpus);
+ machine, &boot_info);
riscv_load_fdt(fdt_load_addr, machine->fdt);
=20
/* Load the reset vector */
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index 8ce85ea9f7..87ad9c8f34 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -81,6 +81,7 @@ static void opentitan_machine_init(MachineState *machine)
OpenTitanState *s =3D OPENTITAN_MACHINE(machine);
const MemMapEntry *memmap =3D ibex_memmap;
MemoryRegion *sys_mem =3D get_system_memory();
+ RISCVBootInfo boot_info;
=20
if (machine->ram_size !=3D mc->default_ram_size) {
char *sz =3D size_to_str(mc->default_ram_size);
@@ -102,8 +103,9 @@ static void opentitan_machine_init(MachineState *machin=
e)
riscv_load_firmware(machine->firmware, &firmware_load_addr, NULL);
}
=20
+ riscv_boot_info_init(&boot_info, &s->soc.cpus);
if (machine->kernel_filename) {
- riscv_load_kernel(machine, &s->soc.cpus,
+ riscv_load_kernel(machine, &boot_info,
memmap[IBEX_DEV_RAM].base,
false, NULL);
}
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
index 5a1959f2a9..ebcd33ab95 100644
--- a/hw/riscv/sifive_e.c
+++ b/hw/riscv/sifive_e.c
@@ -78,6 +78,7 @@ static void sifive_e_machine_init(MachineState *machine)
SiFiveEState *s =3D RISCV_E_MACHINE(machine);
MemoryRegion *sys_mem =3D get_system_memory();
int i;
+ RISCVBootInfo boot_info;
=20
if (machine->ram_size !=3D mc->default_ram_size) {
char *sz =3D size_to_str(mc->default_ram_size);
@@ -113,8 +114,9 @@ static void sifive_e_machine_init(MachineState *machine)
rom_add_blob_fixed_as("mrom.reset", reset_vec, sizeof(reset_vec),
memmap[SIFIVE_E_DEV_MROM].base, &address_space_m=
emory);
=20
+ riscv_boot_info_init(&boot_info, &s->soc.cpus);
if (machine->kernel_filename) {
- riscv_load_kernel(machine, &s->soc.cpus,
+ riscv_load_kernel(machine, &boot_info,
memmap[SIFIVE_E_DEV_DTIM].base,
false, NULL);
}
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index fd59124500..6270e1ccec 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -526,6 +526,7 @@ static void sifive_u_machine_init(MachineState *machine)
BlockBackend *blk;
DeviceState *flash_dev, *sd_dev, *card_dev;
qemu_irq flash_cs, sd_cs;
+ RISCVBootInfo boot_info;
=20
/* Initialize SoC */
object_initialize_child(OBJECT(machine), "soc", &s->soc, TYPE_RISCV_U_=
SOC);
@@ -591,12 +592,13 @@ static void sifive_u_machine_init(MachineState *machi=
ne)
firmware_end_addr =3D riscv_find_and_load_firmware(machine, firmware_n=
ame,
&start_addr, NULL);
=20
+ riscv_boot_info_init(&boot_info, &s->soc.u_cpus);
if (machine->kernel_filename) {
- kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc.u_cpus,
+ kernel_start_addr =3D riscv_calc_kernel_start_addr(&boot_info,
firmware_end_addr=
);
-
- kernel_entry =3D riscv_load_kernel(machine, &s->soc.u_cpus,
- kernel_start_addr, true, NULL);
+ riscv_load_kernel(machine, &boot_info, kernel_start_addr,
+ true, NULL);
+ kernel_entry =3D boot_info.image_low_addr;
} else {
/*
* If dynamic firmware is used, it doesn't know where is the next m=
ode
@@ -607,7 +609,7 @@ static void sifive_u_machine_init(MachineState *machine)
=20
fdt_load_addr =3D riscv_compute_fdt_addr(memmap[SIFIVE_U_DEV_DRAM].bas=
e,
memmap[SIFIVE_U_DEV_DRAM].size,
- machine, &s->soc.u_cpus);
+ machine, &boot_info);
riscv_load_fdt(fdt_load_addr, machine->fdt);
=20
if (!riscv_is_32bit(&s->soc.u_cpus)) {
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index acd7ab1ae1..c3ad16d316 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -206,6 +206,7 @@ static void spike_board_init(MachineState *machine)
char *soc_name;
int i, base_hartid, hart_count;
bool htif_custom_base =3D false;
+ RISCVBootInfo boot_info;
=20
/* Check socket count limit */
if (SPIKE_SOCKETS_MAX < riscv_socket_count(machine)) {
@@ -300,13 +301,14 @@ static void spike_board_init(MachineState *machine)
create_fdt(s, memmap, riscv_is_32bit(&s->soc[0]), htif_custom_base);
=20
/* Load kernel */
+ riscv_boot_info_init(&boot_info, &s->soc[0]);
if (machine->kernel_filename) {
- kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc[0],
+ kernel_start_addr =3D riscv_calc_kernel_start_addr(&boot_info,
firmware_end_addr=
);
=20
- kernel_entry =3D riscv_load_kernel(machine, &s->soc[0],
- kernel_start_addr,
- true, htif_symbol_callback);
+ riscv_load_kernel(machine, &boot_info, kernel_start_addr,
+ true, htif_symbol_callback);
+ kernel_entry =3D boot_info.image_low_addr;
} else {
/*
* If dynamic firmware is used, it doesn't know where is the next m=
ode
@@ -317,7 +319,7 @@ static void spike_board_init(MachineState *machine)
=20
fdt_load_addr =3D riscv_compute_fdt_addr(memmap[SPIKE_DRAM].base,
memmap[SPIKE_DRAM].size,
- machine, &s->soc[0]);
+ machine, &boot_info);
riscv_load_fdt(fdt_load_addr, machine->fdt);
=20
/* load the reset vector */
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 98da79a5be..d2bfdec56a 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -1434,6 +1434,7 @@ static void virt_machine_done(Notifier *notifier, voi=
d *data)
uint64_t fdt_load_addr;
uint64_t kernel_entry =3D 0;
BlockBackend *pflash_blk0;
+ RISCVBootInfo boot_info;
=20
/*
* An user provided dtb must include everything, including
@@ -1482,17 +1483,19 @@ static void virt_machine_done(Notifier *notifier, v=
oid *data)
}
}
=20
+ riscv_boot_info_init(&boot_info, &s->soc[0]);
+
if (machine->kernel_filename && !kernel_entry) {
- kernel_start_addr =3D riscv_calc_kernel_start_addr(&s->soc[0],
+ kernel_start_addr =3D riscv_calc_kernel_start_addr(&boot_info,
firmware_end_addr=
);
-
- kernel_entry =3D riscv_load_kernel(machine, &s->soc[0],
- kernel_start_addr, true, NULL);
+ riscv_load_kernel(machine, &boot_info, kernel_start_addr,
+ true, NULL);
+ kernel_entry =3D boot_info.image_low_addr;
}
=20
fdt_load_addr =3D riscv_compute_fdt_addr(memmap[VIRT_DRAM].base,
memmap[VIRT_DRAM].size,
- machine, &s->soc[0]);
+ machine, &boot_info);
riscv_load_fdt(fdt_load_addr, machine->fdt);
=20
/* load the reset vector */
--=20
2.47.1