From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C6614C433EF for ; Tue, 18 Jan 2022 05:22:13 +0000 (UTC) Received: from localhost ([::1]:50678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9gwe-0002bY-Np for qemu-devel@archiver.kernel.org; Tue, 18 Jan 2022 00:22:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9gut-0001Wk-9p; Tue, 18 Jan 2022 00:20:23 -0500 Received: from [2607:f8b0:4864:20::d35] (port=43921 helo=mail-io1-xd35.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9gur-0002ps-71; Tue, 18 Jan 2022 00:20:22 -0500 Received: by mail-io1-xd35.google.com with SMTP id v1so24055513ioj.10; Mon, 17 Jan 2022 21:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RrW5Q/agDhcjuZW8djv2/7RiIdWuhrl5rIZVLVvEIXI=; b=U9J6PCcVemj7U6P41uIZWduokUzVkcBboAazscLconyMzqjxdzC9p9qgw7NFEo8Rl9 L1grVThh1MayIFWiM2tsjaYM8ucxtE8g+Wd9hJpcxzYto3M1dlZon4ZB55RZ6ecLyK3p ew4PomUUEWHkkvRzUKg/ai9nFa8Xep41QIJrqch3ADDz5i3+hP1pKEuoSv5fvGC/LQAc xi/Gvr/4gV9vnXkeq+0p448QZeECk2Yif4j/FceYq4lP2a5G8ugYN/QbJ52oKTqOJ85E UiiAs8osGiynyFsZpzitcxk6IoCCM7h8bc7lUymZlmnfxBwvRSfFNWYXhs2pT3LsQXzE AAbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RrW5Q/agDhcjuZW8djv2/7RiIdWuhrl5rIZVLVvEIXI=; b=5mbmsWSYSxXj99JvAwP9V/VDvJGwpYxceeUL8URDg377L2IFx1293uWVtHrD38ZzMy pvC14cyHzyBspApPNtInASq5qoMtHKFZudBTRSq/Om1oZv8BJiA1ivjzvSyXfyBmHRcV JRT8UTBthIWnD3+RDOGswGT2NCUNB5b2DxlgPosrUpkudR/PNMUplCAO++LSCtaTAJhY 25ldeErb5XtOkB6hKi/ViCqnj+CuqrXUswB/gjEuFeiiD4V7HJsp+yuX2W3eLTx2j/Dd ZsABW8MBYaNOApPdDM8DZLPUbNUPOu1ni8p2hKc5herLDr6GL/9bog8GAugISIVSd1V2 B9dg== X-Gm-Message-State: AOAM5321daOQ+TfEZuaSLbtDmVlTbbiiElgk+5O9SzLkq3rft8EUr0pj zAjBNe8nuBMLDWAZmeJqjxTer8EzH2Zm4sRNbyE= X-Google-Smtp-Source: ABdhPJymHFlI595Yrx5MM7hNPy5COD7G2xjUbKdvrurjkSzH8Iz2+sogXsm6MxHzp4EKhbxwVXPZ2LX3aDSg5I0AWgQ= X-Received: by 2002:a05:6602:14cd:: with SMTP id b13mr6208125iow.57.1642483219846; Mon, 17 Jan 2022 21:20:19 -0800 (PST) MIME-Version: 1.0 References: <20220114160457.70134-1-apatel@ventanamicro.com> In-Reply-To: <20220114160457.70134-1-apatel@ventanamicro.com> From: Alistair Francis Date: Tue, 18 Jan 2022 15:19:53 +1000 Message-ID: Subject: Re: [PATCH] hw/riscv: spike: Allow using binary firmware as bios To: Anup Patel Content-Type: text/plain; charset="UTF-8" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::d35 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::d35; envelope-from=alistair23@gmail.com; helo=mail-io1-xd35.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Peter Maydell , "open list:RISC-V" , Sagar Karandikar , Anup Patel , "qemu-devel@nongnu.org Developers" , Alistair Francis , Atish Patra , Palmer Dabbelt , Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sat, Jan 15, 2022 at 2:18 AM Anup Patel wrote: > > Currently, we have to use OpenSBI firmware ELF as bios for the spike > machine because the HTIF console requires ELF for parsing "fromhost" > and "tohost" symbols. > > The latest OpenSBI can now optionally pick-up HTIF register address > from HTIF DT node so using this feature spike machine can now use > OpenSBI firmware BIN as bios. Cool! I think that means we can remove the elfs from QEMU. > > Signed-off-by: Anup Patel > --- > hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- > hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- > include/hw/char/riscv_htif.h | 5 ++++- > include/hw/riscv/spike.h | 1 + > 4 files changed, 52 insertions(+), 28 deletions(-) > > diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c > index ddae738d56..b59d321fb7 100644 > --- a/hw/char/riscv_htif.c > +++ b/hw/char/riscv_htif.c > @@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { > .write = htif_mm_write, > }; > > +bool htif_uses_elf_symbols(void) > +{ > + return (address_symbol_set == 3) ? true : false; > +} > + > HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > - CPURISCVState *env, Chardev *chr) > + CPURISCVState *env, Chardev *chr, uint64_t nonelf_base) > { > - uint64_t base = MIN(tohost_addr, fromhost_addr); > - uint64_t size = MAX(tohost_addr + 8, fromhost_addr + 8) - base; > - uint64_t tohost_offset = tohost_addr - base; > - uint64_t fromhost_offset = fromhost_addr - base; > + uint64_t base, size, tohost_offset, fromhost_offset; > + > + if (address_symbol_set != 3) { Why not use htif_uses_elf_symbols() ? Alistair > + fromhost_addr = nonelf_base; > + tohost_addr = nonelf_base + 8; > + } > + > + base = MIN(tohost_addr, fromhost_addr); > + size = MAX(tohost_addr + 8, fromhost_addr + 8) - base; > + tohost_offset = tohost_addr - base; > + fromhost_offset = fromhost_addr - base; > > HTIFState *s = g_malloc0(sizeof(HTIFState)); > s->address_space = address_space; > @@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > qemu_chr_fe_init(&s->chr, chr, &error_abort); > qemu_chr_fe_set_handlers(&s->chr, htif_can_recv, htif_recv, htif_event, > htif_be_change, s, NULL, true); > - if (address_symbol_set == 3) { > - memory_region_init_io(&s->mmio, NULL, &htif_mm_ops, s, > - TYPE_HTIF_UART, size); > - memory_region_add_subregion_overlap(address_space, base, > - &s->mmio, 1); > - } > + > + memory_region_init_io(&s->mmio, NULL, &htif_mm_ops, s, > + TYPE_HTIF_UART, size); > + memory_region_add_subregion_overlap(address_space, base, > + &s->mmio, 1); > > return s; > } > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index 288d69cd9f..597df4c288 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -42,6 +42,7 @@ > > static const MemMapEntry spike_memmap[] = { > [SPIKE_MROM] = { 0x1000, 0xf000 }, > + [SPIKE_HTIF] = { 0x1000000, 0x1000 }, > [SPIKE_CLINT] = { 0x2000000, 0x10000 }, > [SPIKE_DRAM] = { 0x80000000, 0x0 }, > }; > @@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, > > qemu_fdt_add_subnode(fdt, "/htif"); > qemu_fdt_setprop_string(fdt, "/htif", "compatible", "ucb,htif0"); > + if (!htif_uses_elf_symbols()) { > + qemu_fdt_setprop_cells(fdt, "/htif", "reg", > + 0x0, memmap[SPIKE_HTIF].base, 0x0, memmap[SPIKE_HTIF].size); > + } > > qemu_fdt_add_subnode(fdt, "/soc"); > qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); > @@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, > if (cmdline) { > qemu_fdt_add_subnode(fdt, "/chosen"); > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > + qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); > } > } > > @@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine) > memory_region_add_subregion(system_memory, memmap[SPIKE_DRAM].base, > machine->ram); > > - /* create device tree */ > - create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline, > - riscv_is_32bit(&s->soc[0])); > - > /* boot rom */ > memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom", > memmap[SPIKE_MROM].size, &error_fatal); > @@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) > htif_symbol_callback); > } > > + /* Load kernel */ > if (machine->kernel_filename) { > kernel_start_addr = riscv_calc_kernel_start_addr(&s->soc[0], > firmware_end_addr); > @@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) > kernel_entry = riscv_load_kernel(machine->kernel_filename, > kernel_start_addr, > htif_symbol_callback); > - > - if (machine->initrd_filename) { > - hwaddr start; > - hwaddr end = riscv_load_initrd(machine->initrd_filename, > - machine->ram_size, kernel_entry, > - &start); > - qemu_fdt_setprop_cell(s->fdt, "/chosen", > - "linux,initrd-start", start); > - qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", > - end); > - } > } else { > /* > * If dynamic firmware is used, it doesn't know where is the next mode > @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) > kernel_entry = 0; > } > > + /* Create device tree */ > + create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline, > + riscv_is_32bit(&s->soc[0])); > + > + /* Load initrd */ > + if (machine->kernel_filename && machine->initrd_filename) { > + hwaddr start; > + hwaddr end = riscv_load_initrd(machine->initrd_filename, > + machine->ram_size, kernel_entry, > + &start); > + qemu_fdt_setprop_cell(s->fdt, "/chosen", > + "linux,initrd-start", start); > + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", > + end); > + } > + > /* Compute the fdt load address in dram */ > fdt_load_addr = riscv_load_fdt(memmap[SPIKE_DRAM].base, > machine->ram_size, s->fdt); > @@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine) > > /* initialize HTIF using symbols found in load_kernel */ > htif_mm_init(system_memory, mask_rom, > - &s->soc[0].harts[0].env, serial_hd(0)); > + &s->soc[0].harts[0].env, serial_hd(0), > + memmap[SPIKE_HTIF].base); > } > > static void spike_machine_instance_init(Object *obj) > diff --git a/include/hw/char/riscv_htif.h b/include/hw/char/riscv_htif.h > index fb9452cf51..f888ac1b30 100644 > --- a/include/hw/char/riscv_htif.h > +++ b/include/hw/char/riscv_htif.h > @@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops; > void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value, > uint64_t st_size); > > +/* Check if HTIF uses ELF symbols */ > +bool htif_uses_elf_symbols(void); > + > /* legacy pre qom */ > HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > - CPURISCVState *env, Chardev *chr); > + CPURISCVState *env, Chardev *chr, uint64_t nonelf_base); > > #endif > diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h > index cdd1a13011..73d69234de 100644 > --- a/include/hw/riscv/spike.h > +++ b/include/hw/riscv/spike.h > @@ -43,6 +43,7 @@ struct SpikeState { > > enum { > SPIKE_MROM, > + SPIKE_HTIF, > SPIKE_CLINT, > SPIKE_DRAM > }; > -- > 2.25.1 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n9guu-0001Xr-S3 for mharc-qemu-riscv@gnu.org; Tue, 18 Jan 2022 00:20:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9gut-0001Wk-9p; Tue, 18 Jan 2022 00:20:23 -0500 Received: from [2607:f8b0:4864:20::d35] (port=43921 helo=mail-io1-xd35.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9gur-0002ps-71; Tue, 18 Jan 2022 00:20:22 -0500 Received: by mail-io1-xd35.google.com with SMTP id v1so24055513ioj.10; Mon, 17 Jan 2022 21:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RrW5Q/agDhcjuZW8djv2/7RiIdWuhrl5rIZVLVvEIXI=; b=U9J6PCcVemj7U6P41uIZWduokUzVkcBboAazscLconyMzqjxdzC9p9qgw7NFEo8Rl9 L1grVThh1MayIFWiM2tsjaYM8ucxtE8g+Wd9hJpcxzYto3M1dlZon4ZB55RZ6ecLyK3p ew4PomUUEWHkkvRzUKg/ai9nFa8Xep41QIJrqch3ADDz5i3+hP1pKEuoSv5fvGC/LQAc xi/Gvr/4gV9vnXkeq+0p448QZeECk2Yif4j/FceYq4lP2a5G8ugYN/QbJ52oKTqOJ85E UiiAs8osGiynyFsZpzitcxk6IoCCM7h8bc7lUymZlmnfxBwvRSfFNWYXhs2pT3LsQXzE AAbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RrW5Q/agDhcjuZW8djv2/7RiIdWuhrl5rIZVLVvEIXI=; b=5mbmsWSYSxXj99JvAwP9V/VDvJGwpYxceeUL8URDg377L2IFx1293uWVtHrD38ZzMy pvC14cyHzyBspApPNtInASq5qoMtHKFZudBTRSq/Om1oZv8BJiA1ivjzvSyXfyBmHRcV JRT8UTBthIWnD3+RDOGswGT2NCUNB5b2DxlgPosrUpkudR/PNMUplCAO++LSCtaTAJhY 25ldeErb5XtOkB6hKi/ViCqnj+CuqrXUswB/gjEuFeiiD4V7HJsp+yuX2W3eLTx2j/Dd ZsABW8MBYaNOApPdDM8DZLPUbNUPOu1ni8p2hKc5herLDr6GL/9bog8GAugISIVSd1V2 B9dg== X-Gm-Message-State: AOAM5321daOQ+TfEZuaSLbtDmVlTbbiiElgk+5O9SzLkq3rft8EUr0pj zAjBNe8nuBMLDWAZmeJqjxTer8EzH2Zm4sRNbyE= X-Google-Smtp-Source: ABdhPJymHFlI595Yrx5MM7hNPy5COD7G2xjUbKdvrurjkSzH8Iz2+sogXsm6MxHzp4EKhbxwVXPZ2LX3aDSg5I0AWgQ= X-Received: by 2002:a05:6602:14cd:: with SMTP id b13mr6208125iow.57.1642483219846; Mon, 17 Jan 2022 21:20:19 -0800 (PST) MIME-Version: 1.0 References: <20220114160457.70134-1-apatel@ventanamicro.com> In-Reply-To: <20220114160457.70134-1-apatel@ventanamicro.com> From: Alistair Francis Date: Tue, 18 Jan 2022 15:19:53 +1000 Message-ID: Subject: Re: [PATCH] hw/riscv: spike: Allow using binary firmware as bios To: Anup Patel Cc: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , "open list:RISC-V" , Anup Patel , "qemu-devel@nongnu.org Developers" , Atish Patra , Bin Meng Content-Type: text/plain; charset="UTF-8" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::d35 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::d35; envelope-from=alistair23@gmail.com; helo=mail-io1-xd35.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 05:20:23 -0000 On Sat, Jan 15, 2022 at 2:18 AM Anup Patel wrote: > > Currently, we have to use OpenSBI firmware ELF as bios for the spike > machine because the HTIF console requires ELF for parsing "fromhost" > and "tohost" symbols. > > The latest OpenSBI can now optionally pick-up HTIF register address > from HTIF DT node so using this feature spike machine can now use > OpenSBI firmware BIN as bios. Cool! I think that means we can remove the elfs from QEMU. > > Signed-off-by: Anup Patel > --- > hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- > hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- > include/hw/char/riscv_htif.h | 5 ++++- > include/hw/riscv/spike.h | 1 + > 4 files changed, 52 insertions(+), 28 deletions(-) > > diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c > index ddae738d56..b59d321fb7 100644 > --- a/hw/char/riscv_htif.c > +++ b/hw/char/riscv_htif.c > @@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { > .write = htif_mm_write, > }; > > +bool htif_uses_elf_symbols(void) > +{ > + return (address_symbol_set == 3) ? true : false; > +} > + > HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > - CPURISCVState *env, Chardev *chr) > + CPURISCVState *env, Chardev *chr, uint64_t nonelf_base) > { > - uint64_t base = MIN(tohost_addr, fromhost_addr); > - uint64_t size = MAX(tohost_addr + 8, fromhost_addr + 8) - base; > - uint64_t tohost_offset = tohost_addr - base; > - uint64_t fromhost_offset = fromhost_addr - base; > + uint64_t base, size, tohost_offset, fromhost_offset; > + > + if (address_symbol_set != 3) { Why not use htif_uses_elf_symbols() ? Alistair > + fromhost_addr = nonelf_base; > + tohost_addr = nonelf_base + 8; > + } > + > + base = MIN(tohost_addr, fromhost_addr); > + size = MAX(tohost_addr + 8, fromhost_addr + 8) - base; > + tohost_offset = tohost_addr - base; > + fromhost_offset = fromhost_addr - base; > > HTIFState *s = g_malloc0(sizeof(HTIFState)); > s->address_space = address_space; > @@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > qemu_chr_fe_init(&s->chr, chr, &error_abort); > qemu_chr_fe_set_handlers(&s->chr, htif_can_recv, htif_recv, htif_event, > htif_be_change, s, NULL, true); > - if (address_symbol_set == 3) { > - memory_region_init_io(&s->mmio, NULL, &htif_mm_ops, s, > - TYPE_HTIF_UART, size); > - memory_region_add_subregion_overlap(address_space, base, > - &s->mmio, 1); > - } > + > + memory_region_init_io(&s->mmio, NULL, &htif_mm_ops, s, > + TYPE_HTIF_UART, size); > + memory_region_add_subregion_overlap(address_space, base, > + &s->mmio, 1); > > return s; > } > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index 288d69cd9f..597df4c288 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -42,6 +42,7 @@ > > static const MemMapEntry spike_memmap[] = { > [SPIKE_MROM] = { 0x1000, 0xf000 }, > + [SPIKE_HTIF] = { 0x1000000, 0x1000 }, > [SPIKE_CLINT] = { 0x2000000, 0x10000 }, > [SPIKE_DRAM] = { 0x80000000, 0x0 }, > }; > @@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, > > qemu_fdt_add_subnode(fdt, "/htif"); > qemu_fdt_setprop_string(fdt, "/htif", "compatible", "ucb,htif0"); > + if (!htif_uses_elf_symbols()) { > + qemu_fdt_setprop_cells(fdt, "/htif", "reg", > + 0x0, memmap[SPIKE_HTIF].base, 0x0, memmap[SPIKE_HTIF].size); > + } > > qemu_fdt_add_subnode(fdt, "/soc"); > qemu_fdt_setprop(fdt, "/soc", "ranges", NULL, 0); > @@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, > if (cmdline) { > qemu_fdt_add_subnode(fdt, "/chosen"); > qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); > + qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", "/htif"); > } > } > > @@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine) > memory_region_add_subregion(system_memory, memmap[SPIKE_DRAM].base, > machine->ram); > > - /* create device tree */ > - create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline, > - riscv_is_32bit(&s->soc[0])); > - > /* boot rom */ > memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom", > memmap[SPIKE_MROM].size, &error_fatal); > @@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) > htif_symbol_callback); > } > > + /* Load kernel */ > if (machine->kernel_filename) { > kernel_start_addr = riscv_calc_kernel_start_addr(&s->soc[0], > firmware_end_addr); > @@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) > kernel_entry = riscv_load_kernel(machine->kernel_filename, > kernel_start_addr, > htif_symbol_callback); > - > - if (machine->initrd_filename) { > - hwaddr start; > - hwaddr end = riscv_load_initrd(machine->initrd_filename, > - machine->ram_size, kernel_entry, > - &start); > - qemu_fdt_setprop_cell(s->fdt, "/chosen", > - "linux,initrd-start", start); > - qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", > - end); > - } > } else { > /* > * If dynamic firmware is used, it doesn't know where is the next mode > @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) > kernel_entry = 0; > } > > + /* Create device tree */ > + create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline, > + riscv_is_32bit(&s->soc[0])); > + > + /* Load initrd */ > + if (machine->kernel_filename && machine->initrd_filename) { > + hwaddr start; > + hwaddr end = riscv_load_initrd(machine->initrd_filename, > + machine->ram_size, kernel_entry, > + &start); > + qemu_fdt_setprop_cell(s->fdt, "/chosen", > + "linux,initrd-start", start); > + qemu_fdt_setprop_cell(s->fdt, "/chosen", "linux,initrd-end", > + end); > + } > + > /* Compute the fdt load address in dram */ > fdt_load_addr = riscv_load_fdt(memmap[SPIKE_DRAM].base, > machine->ram_size, s->fdt); > @@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine) > > /* initialize HTIF using symbols found in load_kernel */ > htif_mm_init(system_memory, mask_rom, > - &s->soc[0].harts[0].env, serial_hd(0)); > + &s->soc[0].harts[0].env, serial_hd(0), > + memmap[SPIKE_HTIF].base); > } > > static void spike_machine_instance_init(Object *obj) > diff --git a/include/hw/char/riscv_htif.h b/include/hw/char/riscv_htif.h > index fb9452cf51..f888ac1b30 100644 > --- a/include/hw/char/riscv_htif.h > +++ b/include/hw/char/riscv_htif.h > @@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops; > void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value, > uint64_t st_size); > > +/* Check if HTIF uses ELF symbols */ > +bool htif_uses_elf_symbols(void); > + > /* legacy pre qom */ > HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, > - CPURISCVState *env, Chardev *chr); > + CPURISCVState *env, Chardev *chr, uint64_t nonelf_base); > > #endif > diff --git a/include/hw/riscv/spike.h b/include/hw/riscv/spike.h > index cdd1a13011..73d69234de 100644 > --- a/include/hw/riscv/spike.h > +++ b/include/hw/riscv/spike.h > @@ -43,6 +43,7 @@ struct SpikeState { > > enum { > SPIKE_MROM, > + SPIKE_HTIF, > SPIKE_CLINT, > SPIKE_DRAM > }; > -- > 2.25.1 > >