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 C6451C433EF for ; Tue, 18 Jan 2022 05:28:42 +0000 (UTC) Received: from localhost ([::1]:53812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9h2v-0004ze-Lw for qemu-devel@archiver.kernel.org; Tue, 18 Jan 2022 00:28:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9h1t-0004Bi-RQ for qemu-devel@nongnu.org; Tue, 18 Jan 2022 00:27:37 -0500 Received: from [2a00:1450:4864:20::32a] (port=38454 helo=mail-wm1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9h1r-0003oH-Mi for qemu-devel@nongnu.org; Tue, 18 Jan 2022 00:27:37 -0500 Received: by mail-wm1-x32a.google.com with SMTP id p1-20020a1c7401000000b00345c2d068bdso3029150wmc.3 for ; Mon, 17 Jan 2022 21:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brainfault-org.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7NYgomxoPrBWKqHzP0qp4Lh9WafZ0pOu5C712Rog+WQ=; b=hILMzvZjixHKrlsYcAwrovlPlq71f6WnlH8PtnEUfx/NuFgWYfBMDduGPBanZsXrKT 14PjKGuNFYUJjzuKqDDLd4zY6ttWgBMt2C+WjeJ9piBVN7QzTSdaQF9snU4E0r3V2toc GA+uxHH6C32OZe9kV41XlN+LLU+VOwJQ177Khxcrc6Pf+an91AQ1I7WPsOb+F1gkvmSl f1xVQbmtX/WF+57eDJada9lPiR9mrXgkuXxDZlxp89j580L6IuolM0ktOXkITvUDOFYv eNUGuAsogSomjhJsSlBtzThOQCjht+V0doVDGqg9YSbAh4VL7yyAqrPix+Lg7KvCubij upvA== 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=7NYgomxoPrBWKqHzP0qp4Lh9WafZ0pOu5C712Rog+WQ=; b=oosc6rtfH488IQjq1hhQJAo9LnxoQPzNHQQr8IZZKNQR8eYeM26FhfG8pHBDrs8w4y ug0hNAsN12OQARDAG92hcfOrtqcasUPyYbZzxjLIXppVKVCDkfx93NlHnNnkWyViK9Zx VbMahHs5pJ5IAn6arHqxSZyJgaNPLfl7UTfJ81r74WVnRHWSGVJdD2TQ75TYDFDUlz4q EE99p0tZYczjzZURV4L0vGB0bpC+NB0Yq1yNzTNjYMWgvHrwu3qcTa5WrK2ZU1QM3IgA JZ4Ib+5Gl/dBveRwDm/VydjOEkg9ScyV34/4J0Q8j+qWt0DvRVadDAZqy6OuOGpe9BsF FPig== X-Gm-Message-State: AOAM533UZFebIwlb0ZGZx2UfB3skg2fa+YB797Gw/u3rOZn+1vEsXaq0 hN1zXjpHY37MEca3LowDMGAeOMU7umLJzs7+GcqqXg== X-Google-Smtp-Source: ABdhPJyHjU8WrAJCzD7V+x3y6mNE4EZBWvuisZOTdhUCKM+c9w7EF66BiPiTXNzMKOeAXEKxvX3LOkvouVOohrus5Vk= X-Received: by 2002:a05:6000:1286:: with SMTP id f6mr22263622wrx.346.1642483653899; Mon, 17 Jan 2022 21:27:33 -0800 (PST) MIME-Version: 1.0 References: <20220114160457.70134-1-apatel@ventanamicro.com> In-Reply-To: From: Anup Patel Date: Tue, 18 Jan 2022 10:57:22 +0530 Message-ID: Subject: Re: [PATCH] hw/riscv: spike: Allow using binary firmware as bios To: Alistair Francis Content-Type: text/plain; charset="UTF-8" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32a (failed) Received-SPF: none client-ip=2a00:1450:4864:20::32a; envelope-from=anup@brainfault.org; helo=mail-wm1-x32a.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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=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: Anup Patel , Peter Maydell , "open list:RISC-V" , Sagar Karandikar , "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 Tue, Jan 18, 2022 at 10:50 AM Alistair Francis wrote: > > 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. Yes, we can definitely 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() ? Ahh, yes. I should have used htif_uses_elf_symbols() here. I will update it in the next revision. Regards, Anup > > 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 1n9h1v-0004C8-D3 for mharc-qemu-riscv@gnu.org; Tue, 18 Jan 2022 00:27:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9h1t-0004Bh-OY for qemu-riscv@nongnu.org; Tue, 18 Jan 2022 00:27:37 -0500 Received: from [2a00:1450:4864:20::333] (port=42599 helo=mail-wm1-x333.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9h1r-0003oI-Mi for qemu-riscv@nongnu.org; Tue, 18 Jan 2022 00:27:37 -0500 Received: by mail-wm1-x333.google.com with SMTP id ay4-20020a05600c1e0400b0034a81a94607so4345467wmb.1 for ; Mon, 17 Jan 2022 21:27:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brainfault-org.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7NYgomxoPrBWKqHzP0qp4Lh9WafZ0pOu5C712Rog+WQ=; b=hILMzvZjixHKrlsYcAwrovlPlq71f6WnlH8PtnEUfx/NuFgWYfBMDduGPBanZsXrKT 14PjKGuNFYUJjzuKqDDLd4zY6ttWgBMt2C+WjeJ9piBVN7QzTSdaQF9snU4E0r3V2toc GA+uxHH6C32OZe9kV41XlN+LLU+VOwJQ177Khxcrc6Pf+an91AQ1I7WPsOb+F1gkvmSl f1xVQbmtX/WF+57eDJada9lPiR9mrXgkuXxDZlxp89j580L6IuolM0ktOXkITvUDOFYv eNUGuAsogSomjhJsSlBtzThOQCjht+V0doVDGqg9YSbAh4VL7yyAqrPix+Lg7KvCubij upvA== 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=7NYgomxoPrBWKqHzP0qp4Lh9WafZ0pOu5C712Rog+WQ=; b=ETrTdPfFwAEXWK0ZAuWvNSRd1VMTKXQN+PqWjkZEOxpfzMFotNW4YGMDzxFBwHSzeo hWrdNSzdA9ydz38CcQAswtvVZN9Wti/7zbybuTKU0B8Dfgazlhwt2WnjJpG7FYua96Ft B2o2xnqOneaz6Kavg/XJf16DDT6cgyV5spHjvHnvjHjVD5v8whCTmxshhnDQmUgDbESF WlXV17/CK65meEnYRDwV2xUd8DYMEes5tUdLLMAK8WKaIZWnJyctoyD/2U1KEiTW/fEK t3tYIkR0DT0RMbFtVz3QPtePkkuELRTPrG89J15O7QDpDyRDrJec0KRRWAkGRks0S1QB 2Gpw== X-Gm-Message-State: AOAM530W05ZHOOfOjy7CtG/16/idfAbIRAr/5C8k+vQQ0+UFK24qPtPo DGWcYXx0XhDdNY7tYTNkqBW1+r3rGXLDfsFhEppKmg== X-Google-Smtp-Source: ABdhPJyHjU8WrAJCzD7V+x3y6mNE4EZBWvuisZOTdhUCKM+c9w7EF66BiPiTXNzMKOeAXEKxvX3LOkvouVOohrus5Vk= X-Received: by 2002:a05:6000:1286:: with SMTP id f6mr22263622wrx.346.1642483653899; Mon, 17 Jan 2022 21:27:33 -0800 (PST) MIME-Version: 1.0 References: <20220114160457.70134-1-apatel@ventanamicro.com> In-Reply-To: From: Anup Patel Date: Tue, 18 Jan 2022 10:57:22 +0530 Message-ID: Subject: Re: [PATCH] hw/riscv: spike: Allow using binary firmware as bios To: Alistair Francis Cc: Anup Patel , Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , "open list:RISC-V" , "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 2a00:1450:4864:20::333 (failed) Received-SPF: none client-ip=2a00:1450:4864:20::333; envelope-from=anup@brainfault.org; helo=mail-wm1-x333.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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=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:27:38 -0000 On Tue, Jan 18, 2022 at 10:50 AM Alistair Francis wrote: > > 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. Yes, we can definitely 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() ? Ahh, yes. I should have used htif_uses_elf_symbols() here. I will update it in the next revision. Regards, Anup > > 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 > > > >