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 X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68BA8C74A35 for ; Wed, 10 Jul 2019 23:08:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 35ED120838 for ; Wed, 10 Jul 2019 23:08:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KjpRU0A5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35ED120838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlLhn-0005UI-4E for qemu-devel@archiver.kernel.org; Wed, 10 Jul 2019 19:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54945) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlLh8-0004xh-Uf for qemu-devel@nongnu.org; Wed, 10 Jul 2019 19:08:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlLh7-0005Rx-DT for qemu-devel@nongnu.org; Wed, 10 Jul 2019 19:08:14 -0400 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:38324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlLh7-0005PV-2j; Wed, 10 Jul 2019 19:08:13 -0400 Received: by mail-lf1-x141.google.com with SMTP id h28so2715161lfj.5; Wed, 10 Jul 2019 16:08:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3FmDEHToBg5ktohao5T3pUw12ZNzopiAroElhd1bzJQ=; b=KjpRU0A5yoTNrtrxAYm9BY2KoTEKAMZEZJ/NEtQAstvs7/wm5axvp70SOBObtpbR6j Q2OyVsPQtqt8JrX5N57WX2X3BDTOZKP7KpgttY1s+/zDxqp9m5EEakkk3MSgWk15M8jY q7qmVP3tISDCpd3Z8fue2eHO6PODJDyb2flva1lmaMbHS2wnFoKwne20qi7d4Ge219iG y6ijj3tvyP9HmRw0Ksa8J0LJFkvoHpr5X7XkeV54ADCoto9ai04JS2UJX3/nx/RPRicj BlCEp0Puxo07+K1bNn3IPn459q7I8SQdI56joAQTMoVa/jfbcf8x9AFo4rwn30yQidN0 LB/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3FmDEHToBg5ktohao5T3pUw12ZNzopiAroElhd1bzJQ=; b=RH3Sb34tqS8vcZcQ6rt9JeDG5/12RYocf2H7umChir5IAfOggUpg2klaK9GfeXUMuX gh0mkpR4CZ2Vvx6L+i53vTm7sxqIGEAfTfrkonS8OCbQu6fJVsCr/Y4tXR5aG6Gz+lzG X7OfBVUO+28mMgjy3aD3Rfn17ZjVdrdqxJ6BQRh7gFdfE0ezqCClkdBBrw8cY8zkzdQH y04jHB9LJoqd2yTFKxEc1Xj8gLj4prPeGM8G8Od0nYmdka1YGqIk+a3wJhu1weuRRwHd hK7ShUjr5radrACqLkgG+xoJ9Y/l9ludMlDV4kNSIyFSyZ08pSz84Y7MqHINbA3X2X7a 1wUg== X-Gm-Message-State: APjAAAWbD9tXb4pCsO+TUtdI87IJNzvS1lRmL53H2B8Wfm5em+Hco9bq k5PFyM7CUXiDoz0bHdbfKST70qtMSPT96PA48dA= X-Google-Smtp-Source: APXvYqzshi8nEcRWDLyoyDK4X2wfhkWgYbtGhspC5MALaTZJ2Zz5721bXLWJBaMVD8V9dEpNIi3p9sSV5qCp4zfuCz0= X-Received: by 2002:a05:6512:29a:: with SMTP id j26mr103106lfp.44.1562800089993; Wed, 10 Jul 2019 16:08:09 -0700 (PDT) MIME-Version: 1.0 References: <238062dcf3a9b99a048c8e7ae439cad7745af1da.1562611535.git.alistair.francis@wdc.com> <20190710224607.GA24207@roeck-us.net> In-Reply-To: <20190710224607.GA24207@roeck-us.net> From: Alistair Francis Date: Wed, 10 Jul 2019 16:04:58 -0700 Message-ID: To: Guenter Roeck Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::141 Subject: Re: [Qemu-devel] [PATCH v1 2/2] hw/riscv: Load OpenSBI as the default firmware X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "open list:RISC-V" , Jeff Cody , Anup Patel , Palmer Dabbelt , "qemu-devel@nongnu.org Developers" , Alistair Francis , Stefan Hajnoczi , Paolo Bonzini , Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Jul 10, 2019 at 3:46 PM Guenter Roeck wrote: > > On Mon, Jul 08, 2019 at 11:49:40AM -0700, Alistair Francis wrote: > > If the user hasn't specified a firmware to load (with -bios) or > > specified no bios (with -bios none) then load OpenSBI by default. This > > allows users to boot a RISC-V kernel with just -kernel. > > > > Signed-off-by: Alistair Francis > > Reviewed-by: Bin Meng > > Tested-by: Bin Meng > > --- > > hw/riscv/boot.c | 49 +++++++++++++++++++++++++++++++++++++++++ > > hw/riscv/sifive_u.c | 7 +++--- > > hw/riscv/virt.c | 11 ++++++--- > > include/hw/riscv/boot.h | 3 +++ > > qemu-deprecated.texi | 20 +++++++++++++++++ > > 5 files changed, 84 insertions(+), 6 deletions(-) > > > > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c > > index ff023f42d0..c7d72f682f 100644 > > --- a/hw/riscv/boot.c > > +++ b/hw/riscv/boot.c > > @@ -18,6 +18,7 @@ > > */ > > > > #include "qemu/osdep.h" > > +#include "qemu-common.h" > > #include "qemu/units.h" > > #include "qemu/error-report.h" > > #include "exec/cpu-defs.h" > > @@ -32,6 +33,54 @@ > > # define KERNEL_BOOT_ADDRESS 0x80200000 > > #endif > > > > +void riscv_find_and_load_firmware(MachineState *machine, > > + const char *default_machine_firmware, > > + hwaddr firmware_load_addr) > > +{ > > + char *firmware_filename; > > + > > + if (!machine->firmware) { > > + /* > > + * The user didn't specify -bios. > > + * At the moment we default to loading nothing when this hapens. > > + * In the future this defaul will change to loading the prebuilt > > + * OpenSBI firmware. Let's warn the user and then continue. > > + */ > > + warn_report("No -bios option specified. Not loading a firmware."); > > + warn_report("This default will change in QEMU 4.3. Please use the " \ > > + "-bios option to aviod breakages when this happens."); > > + warn_report("See QEMU's deprecation documentation for details"); > > + return; > > + } > > + > > + if (!strcmp(machine->firmware, "default")) { > > + /* > > + * The user has specified "-bios default". That means we are going to > > + * load the OpenSBI binary included in the QEMU source. > > + * > > + * We can't load the binary by default as it will break existing users > > + * as users are already loading their own firmware. > > + * > > + * Let's try to get everyone to specify the -bios option at all times, > > + * so then in the future we can make "-bios default" the default option > > + * if no -bios option is set without breaking anything. > > + */ > > + firmware_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, > > + default_machine_firmware); > > This can return NULL if the file is not found (such as after a bad install) ... > > > + } else { > > + firmware_filename = machine->firmware; > > + } > > + > > + if (strcmp(firmware_filename, "none")) { > > ... which will then crash here. Yep, you are right. I'll send a v2 Alistair > > > + /* If not "none" load the firmware */ > > + riscv_load_firmware(firmware_filename, firmware_load_addr); > > + } > > + > > + if (!strcmp(machine->firmware, "default")) { > > + g_free(firmware_filename); > > + } > > +} > > + > > target_ulong riscv_load_firmware(const char *firmware_filename, > > hwaddr firmware_load_addr) > > { > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > > index ca53a9290d..71b8083c05 100644 > > --- a/hw/riscv/sifive_u.c > > +++ b/hw/riscv/sifive_u.c > > @@ -49,6 +49,8 @@ > > > > #include > > > > +#define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin" > > + > > static const struct MemmapEntry { > > hwaddr base; > > hwaddr size; > > @@ -269,9 +271,8 @@ static void riscv_sifive_u_init(MachineState *machine) > > /* create device tree */ > > create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); > > > > - if (machine->firmware) { > > - riscv_load_firmware(machine->firmware, memmap[SIFIVE_U_DRAM].base); > > - } > > + riscv_find_and_load_firmware(machine, BIOS_FILENAME, > > + memmap[SIFIVE_U_DRAM].base); > > > > if (machine->kernel_filename) { > > riscv_load_kernel(machine->kernel_filename); > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > > index ecdc77d728..25faf3b417 100644 > > --- a/hw/riscv/virt.c > > +++ b/hw/riscv/virt.c > > @@ -44,6 +44,12 @@ > > > > #include > > > > +#if defined(TARGET_RISCV32) > > +# define BIOS_FILENAME "opensbi-riscv32-virt-fw_jump.bin" > > +#else > > +# define BIOS_FILENAME "opensbi-riscv64-virt-fw_jump.bin" > > +#endif > > + > > static const struct MemmapEntry { > > hwaddr base; > > hwaddr size; > > @@ -399,9 +405,8 @@ static void riscv_virt_board_init(MachineState *machine) > > memory_region_add_subregion(system_memory, memmap[VIRT_MROM].base, > > mask_rom); > > > > - if (machine->firmware) { > > - riscv_load_firmware(machine->firmware, memmap[VIRT_DRAM].base); > > - } > > + riscv_find_and_load_firmware(machine, BIOS_FILENAME, > > + memmap[VIRT_DRAM].base); > > > > if (machine->kernel_filename) { > > uint64_t kernel_entry = riscv_load_kernel(machine->kernel_filename); > > diff --git a/include/hw/riscv/boot.h b/include/hw/riscv/boot.h > > index daa179b600..d56f2ae3eb 100644 > > --- a/include/hw/riscv/boot.h > > +++ b/include/hw/riscv/boot.h > > @@ -20,6 +20,9 @@ > > #ifndef RISCV_BOOT_H > > #define RISCV_BOOT_H > > > > +void riscv_find_and_load_firmware(MachineState *machine, > > + const char *default_machine_firmware, > > + hwaddr firmware_load_addr); > > target_ulong riscv_load_firmware(const char *firmware_filename, > > hwaddr firmware_load_addr); > > target_ulong riscv_load_kernel(const char *kernel_filename); > > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi > > index c90b08d553..fff07bb2a3 100644 > > --- a/qemu-deprecated.texi > > +++ b/qemu-deprecated.texi > > @@ -121,6 +121,26 @@ the backing storage specified with @option{-mem-path} can actually provide > > the guest RAM configured with @option{-m} and QEMU will fail to start up if > > RAM allocation is unsuccessful. > > > > +@subsection RISC-V -bios (since 4.1) > > + > > +QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the > > +RISC-V virt machine and sifive_u machine. > > + > > +QEMU 4.1 has no changes to the default behaviour to avoid breakages. This > > +default will change in a future QEMU release, so please prepare now. All users > > +of the virt or sifive_u machine must change their command line usage. > > + > > +QEMU 4.1 has three options, please migrate to one of these three: > > + 1. ``-bios none`` - This is the current default behavior if no -bios option > > + is included. QEMU will not automatically load any firmware. It is up > > + to the user to load all the images they need. > > + 2. ``-bios default`` - In a future QEMU release this will become the default > > + behaviour if no -bios option is specified. This option will load the > > + default OpenSBI firmware automatically. The firmware is included with > > + the QEMU release and no user interaction is required. All a user needs > > + to do is specify the kernel they want to boot with the -kernel option > > + 3. ``-bios `` - Tells QEMU to load the specified file as the firmwrae. > > + > > @section QEMU Machine Protocol (QMP) commands > > > > @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)