From: Bin Meng <bin.meng@windriver.com>

The RISC-V generic platform is a flattened device tree (FDT) based
platform where all platform specific functionality is provided based
on FDT passed by previous booting stage. The support was added in
the upstream OpenSBI v0.8 release recently.

This series updates QEMU to switch to use generic platform of opensbi
bios images.

The patch emails do not contain binary bits, please grab all updates
at https://github.com/lbmeng/qemu.git bios branch.

Changes in v2:
- new patch: configure: Create symbolic links for pc-bios/*.elf files
- Upgrade OpenSBI to v0.8 release
- Copy the ELF images too in the make rules
- Include ELF images in the artifacts
- new patch: Makefile: Ship the generic platform bios images for RISC-V

Bin Meng (7):
  configure: Create symbolic links for pc-bios/*.elf files
  roms/opensbi: Upgrade from v0.7 to v0.8
  roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
  hw/riscv: Use pre-built bios image of generic platform for virt &
    sifive_u
  hw/riscv: spike: Change the default bios to use generic platform image
  gitlab-ci/opensbi: Update GitLab CI to build generic platform
  Makefile: Ship the generic platform bios images for RISC-V

 .gitlab-ci.d/opensbi.yml                     |  28 +++++++++--------------
 Makefile                                     |   4 ++--
 configure                                    |   1 +
 hw/riscv/sifive_u.c                          |   4 ++--
 hw/riscv/spike.c                             |   9 ++++++--
 hw/riscv/virt.c                              |   4 ++--
 pc-bios/opensbi-riscv32-generic-fw_jump.bin  | Bin 0 -> 58048 bytes
 pc-bios/opensbi-riscv32-generic-fw_jump.elf  | Bin 0 -> 554156 bytes
 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes
 pc-bios/opensbi-riscv32-virt-fw_jump.bin     | Bin 49504 -> 0 bytes
 pc-bios/opensbi-riscv64-generic-fw_jump.bin  | Bin 0 -> 70792 bytes
 pc-bios/opensbi-riscv64-generic-fw_jump.elf  | Bin 0 -> 619960 bytes
 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes
 pc-bios/opensbi-riscv64-virt-fw_jump.bin     | Bin 57920 -> 0 bytes
 roms/Makefile                                |  32 +++++++++------------------
 roms/opensbi                                 |   2 +-
 16 files changed, 35 insertions(+), 49 deletions(-)
 create mode 100644 pc-bios/opensbi-riscv32-generic-fw_jump.bin
 create mode 100644 pc-bios/opensbi-riscv32-generic-fw_jump.elf
 delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
 delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin
 create mode 100644 pc-bios/opensbi-riscv64-generic-fw_jump.bin
 create mode 100644 pc-bios/opensbi-riscv64-generic-fw_jump.elf
 delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
 delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin

-- 
2.7.4

> -----Original Message-----
> From: Qemu-riscv <qemu-riscv-
> bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> Sent: 22 June 2020 12:03
> To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> <palmerdabbelt@google.com>; Sagar Karandikar
> <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> riscv@nongnu.org
> Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> <bin.meng@windriver.com>
> Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi bios
> images
> 
> From: Bin Meng <bin.meng@windriver.com>
> 
> The RISC-V generic platform is a flattened device tree (FDT) based platform
> where all platform specific functionality is provided based on FDT passed by
> previous booting stage. The support was added in the upstream OpenSBI
> v0.8 release recently.
> 
> This series updates QEMU to switch to use generic platform of opensbi bios
> images.
> 
> The patch emails do not contain binary bits, please grab all updates at
> https://github.com/lbmeng/qemu.git bios branch.

It will be nice to have this series updated to for fw_dynamic.bin .

Maybe you can rebase your series on top of Atish's patches ?? 

Regards,
Anup

> 
> Changes in v2:
> - new patch: configure: Create symbolic links for pc-bios/*.elf files
> - Upgrade OpenSBI to v0.8 release
> - Copy the ELF images too in the make rules
> - Include ELF images in the artifacts
> - new patch: Makefile: Ship the generic platform bios images for RISC-V
> 
> Bin Meng (7):
>   configure: Create symbolic links for pc-bios/*.elf files
>   roms/opensbi: Upgrade from v0.7 to v0.8
>   roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
>   hw/riscv: Use pre-built bios image of generic platform for virt &
>     sifive_u
>   hw/riscv: spike: Change the default bios to use generic platform image
>   gitlab-ci/opensbi: Update GitLab CI to build generic platform
>   Makefile: Ship the generic platform bios images for RISC-V
> 
>  .gitlab-ci.d/opensbi.yml                     |  28 +++++++++--------------
>  Makefile                                     |   4 ++--
>  configure                                    |   1 +
>  hw/riscv/sifive_u.c                          |   4 ++--
>  hw/riscv/spike.c                             |   9 ++++++--
>  hw/riscv/virt.c                              |   4 ++--
>  pc-bios/opensbi-riscv32-generic-fw_jump.bin  | Bin 0 -> 58048 bytes  pc-
> bios/opensbi-riscv32-generic-fw_jump.elf  | Bin 0 -> 554156 bytes  pc-
> bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes
>  pc-bios/opensbi-riscv32-virt-fw_jump.bin     | Bin 49504 -> 0 bytes
>  pc-bios/opensbi-riscv64-generic-fw_jump.bin  | Bin 0 -> 70792 bytes  pc-
> bios/opensbi-riscv64-generic-fw_jump.elf  | Bin 0 -> 619960 bytes  pc-
> bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes
>  pc-bios/opensbi-riscv64-virt-fw_jump.bin     | Bin 57920 -> 0 bytes
>  roms/Makefile                                |  32 +++++++++------------------
>  roms/opensbi                                 |   2 +-
>  16 files changed, 35 insertions(+), 49 deletions(-)  create mode 100644 pc-
> bios/opensbi-riscv32-generic-fw_jump.bin
>  create mode 100644 pc-bios/opensbi-riscv32-generic-fw_jump.elf
>  delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
>  delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin
>  create mode 100644 pc-bios/opensbi-riscv64-generic-fw_jump.bin
>  create mode 100644 pc-bios/opensbi-riscv64-generic-fw_jump.elf
>  delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
>  delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
> 
> --
> 2.7.4
> 

Hi Anup,

On Mon, Jun 22, 2020 at 6:09 PM Anup Patel <Anup.Patel@wdc.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Qemu-riscv <qemu-riscv-
> > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> > Sent: 22 June 2020 12:03
> > To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > <palmerdabbelt@google.com>; Sagar Karandikar
> > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > riscv@nongnu.org
> > Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> > <bin.meng@windriver.com>
> > Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi bios
> > images
> >
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > The RISC-V generic platform is a flattened device tree (FDT) based platform
> > where all platform specific functionality is provided based on FDT passed by
> > previous booting stage. The support was added in the upstream OpenSBI
> > v0.8 release recently.
> >
> > This series updates QEMU to switch to use generic platform of opensbi bios
> > images.
> >
> > The patch emails do not contain binary bits, please grab all updates at
> > https://github.com/lbmeng/qemu.git bios branch.
>
> It will be nice to have this series updated to for fw_dynamic.bin .

Do you mean we include fw_dynamic.bin for virt & sifive_u, and
fw_dynamic.elf for spike?

But previously we agreed to include only generic platform BIN and ELF files.
See https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg00664.html

>
> Maybe you can rebase your series on top of Atish's patches ??

Regards,
Bin

> -----Original Message-----
> From: Bin Meng <bmeng.cn@gmail.com>
> Sent: 22 June 2020 17:43
> To: Anup Patel <Anup.Patel@wdc.com>
> Cc: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> <palmerdabbelt@google.com>; Sagar Karandikar
> <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> riscv@nongnu.org; Anup Patel <anup@brainfault.org>; Bin Meng
> <bin.meng@windriver.com>
> Subject: Re: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi
> bios images
> 
> Hi Anup,
> 
> On Mon, Jun 22, 2020 at 6:09 PM Anup Patel <Anup.Patel@wdc.com> wrote:
> >
> >
> >
> > > -----Original Message-----
> > > From: Qemu-riscv <qemu-riscv-
> > > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> > > Sent: 22 June 2020 12:03
> > > To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > riscv@nongnu.org
> > > Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> > > <bin.meng@windriver.com>
> > > Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of
> > > opensbi bios images
> > >
> > > From: Bin Meng <bin.meng@windriver.com>
> > >
> > > The RISC-V generic platform is a flattened device tree (FDT) based
> > > platform where all platform specific functionality is provided based
> > > on FDT passed by previous booting stage. The support was added in
> > > the upstream OpenSBI
> > > v0.8 release recently.
> > >
> > > This series updates QEMU to switch to use generic platform of
> > > opensbi bios images.
> > >
> > > The patch emails do not contain binary bits, please grab all updates
> > > at https://github.com/lbmeng/qemu.git bios branch.
> >
> > It will be nice to have this series updated to for fw_dynamic.bin .
> 
> Do you mean we include fw_dynamic.bin for virt & sifive_u, and
> fw_dynamic.elf for spike?
> 
> But previously we agreed to include only generic platform BIN and ELF files.
> See https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg00664.html

I am suggesting to use Generic platform fw_dynamic.bin and fw_dynamic.elf
for QEMU virt, QEMU spike, and QEMU sifive_u machines.

Regards,
Anup

Hi Anup,

On Mon, Jun 22, 2020 at 8:20 PM Anup Patel <Anup.Patel@wdc.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Bin Meng <bmeng.cn@gmail.com>
> > Sent: 22 June 2020 17:43
> > To: Anup Patel <Anup.Patel@wdc.com>
> > Cc: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > <palmerdabbelt@google.com>; Sagar Karandikar
> > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > riscv@nongnu.org; Anup Patel <anup@brainfault.org>; Bin Meng
> > <bin.meng@windriver.com>
> > Subject: Re: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi
> > bios images
> >
> > Hi Anup,
> >
> > On Mon, Jun 22, 2020 at 6:09 PM Anup Patel <Anup.Patel@wdc.com> wrote:
> > >
> > >
> > >
> > > > -----Original Message-----
> > > > From: Qemu-riscv <qemu-riscv-
> > > > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> > > > Sent: 22 June 2020 12:03
> > > > To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > > > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > > riscv@nongnu.org
> > > > Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> > > > <bin.meng@windriver.com>
> > > > Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of
> > > > opensbi bios images
> > > >
> > > > From: Bin Meng <bin.meng@windriver.com>
> > > >
> > > > The RISC-V generic platform is a flattened device tree (FDT) based
> > > > platform where all platform specific functionality is provided based
> > > > on FDT passed by previous booting stage. The support was added in
> > > > the upstream OpenSBI
> > > > v0.8 release recently.
> > > >
> > > > This series updates QEMU to switch to use generic platform of
> > > > opensbi bios images.
> > > >
> > > > The patch emails do not contain binary bits, please grab all updates
> > > > at https://github.com/lbmeng/qemu.git bios branch.
> > >
> > > It will be nice to have this series updated to for fw_dynamic.bin .
> >
> > Do you mean we include fw_dynamic.bin for virt & sifive_u, and
> > fw_dynamic.elf for spike?
> >
> > But previously we agreed to include only generic platform BIN and ELF files.
> > See https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg00664.html
>
> I am suggesting to use Generic platform fw_dynamic.bin and fw_dynamic.elf
> for QEMU virt, QEMU spike, and QEMU sifive_u machines.

Do you mean we replace fw_jump.bin with fw_dynamic.bin in QEMU? If
everyone agrees this is the way to go, I can rebase this series on top
of Atish's fw_dynamic.bin support series.

Regards,
Bin

> -----Original Message-----
> From: Bin Meng <bmeng.cn@gmail.com>
> Sent: 22 June 2020 17:57
> To: Anup Patel <Anup.Patel@wdc.com>
> Cc: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> <palmerdabbelt@google.com>; Sagar Karandikar
> <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> riscv@nongnu.org; Anup Patel <anup@brainfault.org>; Bin Meng
> <bin.meng@windriver.com>
> Subject: Re: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi
> bios images
> 
> Hi Anup,
> 
> On Mon, Jun 22, 2020 at 8:20 PM Anup Patel <Anup.Patel@wdc.com> wrote:
> >
> >
> >
> > > -----Original Message-----
> > > From: Bin Meng <bmeng.cn@gmail.com>
> > > Sent: 22 June 2020 17:43
> > > To: Anup Patel <Anup.Patel@wdc.com>
> > > Cc: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > riscv@nongnu.org; Anup Patel <anup@brainfault.org>; Bin Meng
> > > <bin.meng@windriver.com>
> > > Subject: Re: [PATCH v2 0/7] riscv: Switch to use generic platform of
> > > opensbi bios images
> > >
> > > Hi Anup,
> > >
> > > On Mon, Jun 22, 2020 at 6:09 PM Anup Patel <Anup.Patel@wdc.com>
> wrote:
> > > >
> > > >
> > > >
> > > > > -----Original Message-----
> > > > > From: Qemu-riscv <qemu-riscv-
> > > > > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> > > > > Sent: 22 June 2020 12:03
> > > > > To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian
> > > > > Koppelmann <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > > > riscv@nongnu.org
> > > > > Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> > > > > <bin.meng@windriver.com>
> > > > > Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of
> > > > > opensbi bios images
> > > > >
> > > > > From: Bin Meng <bin.meng@windriver.com>
> > > > >
> > > > > The RISC-V generic platform is a flattened device tree (FDT)
> > > > > based platform where all platform specific functionality is
> > > > > provided based on FDT passed by previous booting stage. The
> > > > > support was added in the upstream OpenSBI
> > > > > v0.8 release recently.
> > > > >
> > > > > This series updates QEMU to switch to use generic platform of
> > > > > opensbi bios images.
> > > > >
> > > > > The patch emails do not contain binary bits, please grab all
> > > > > updates at https://github.com/lbmeng/qemu.git bios branch.
> > > >
> > > > It will be nice to have this series updated to for fw_dynamic.bin .
> > >
> > > Do you mean we include fw_dynamic.bin for virt & sifive_u, and
> > > fw_dynamic.elf for spike?
> > >
> > > But previously we agreed to include only generic platform BIN and ELF
> files.
> > > See
> > > https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg00664.html
> >
> > I am suggesting to use Generic platform fw_dynamic.bin and
> > fw_dynamic.elf for QEMU virt, QEMU spike, and QEMU sifive_u machines.
> 
> Do you mean we replace fw_jump.bin with fw_dynamic.bin in QEMU? If
> everyone agrees this is the way to go, I can rebase this series on top of
> Atish's fw_dynamic.bin support series.

Yes, replace fw_jump.bin with fw_dynamic.bin in QEMU. It will definitely
benefit large kernel images (such as FreeBSD kernel) and it allow QEMU to
decide the FDT placement in DRAM.

Regards,
Anup

On Mon, Jun 22, 2020 at 5:27 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> Hi Anup,
>
> On Mon, Jun 22, 2020 at 8:20 PM Anup Patel <Anup.Patel@wdc.com> wrote:
> >
> >
> >
> > > -----Original Message-----
> > > From: Bin Meng <bmeng.cn@gmail.com>
> > > Sent: 22 June 2020 17:43
> > > To: Anup Patel <Anup.Patel@wdc.com>
> > > Cc: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > riscv@nongnu.org; Anup Patel <anup@brainfault.org>; Bin Meng
> > > <bin.meng@windriver.com>
> > > Subject: Re: [PATCH v2 0/7] riscv: Switch to use generic platform of opensbi
> > > bios images
> > >
> > > Hi Anup,
> > >
> > > On Mon, Jun 22, 2020 at 6:09 PM Anup Patel <Anup.Patel@wdc.com> wrote:
> > > >
> > > >
> > > >
> > > > > -----Original Message-----
> > > > > From: Qemu-riscv <qemu-riscv-
> > > > > bounces+anup.patel=wdc.com@nongnu.org> On Behalf Of Bin Meng
> > > > > Sent: 22 June 2020 12:03
> > > > > To: Alistair Francis <Alistair.Francis@wdc.com>; Bastian Koppelmann
> > > > > <kbastian@mail.uni-paderborn.de>; Palmer Dabbelt
> > > > > <palmerdabbelt@google.com>; Sagar Karandikar
> > > > > <sagark@eecs.berkeley.edu>; qemu-devel@nongnu.org; qemu-
> > > > > riscv@nongnu.org
> > > > > Cc: Anup Patel <anup@brainfault.org>; Bin Meng
> > > > > <bin.meng@windriver.com>
> > > > > Subject: [PATCH v2 0/7] riscv: Switch to use generic platform of
> > > > > opensbi bios images
> > > > >
> > > > > From: Bin Meng <bin.meng@windriver.com>
> > > > >
> > > > > The RISC-V generic platform is a flattened device tree (FDT) based
> > > > > platform where all platform specific functionality is provided based
> > > > > on FDT passed by previous booting stage. The support was added in
> > > > > the upstream OpenSBI
> > > > > v0.8 release recently.
> > > > >
> > > > > This series updates QEMU to switch to use generic platform of
> > > > > opensbi bios images.
> > > > >
> > > > > The patch emails do not contain binary bits, please grab all updates
> > > > > at https://github.com/lbmeng/qemu.git bios branch.
> > > >
> > > > It will be nice to have this series updated to for fw_dynamic.bin .
> > >
> > > Do you mean we include fw_dynamic.bin for virt & sifive_u, and
> > > fw_dynamic.elf for spike?
> > >
> > > But previously we agreed to include only generic platform BIN and ELF files.
> > > See https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg00664.html
> >
> > I am suggesting to use Generic platform fw_dynamic.bin and fw_dynamic.elf
> > for QEMU virt, QEMU spike, and QEMU sifive_u machines.
>
> Do you mean we replace fw_jump.bin with fw_dynamic.bin in QEMU? If
> everyone agrees this is the way to go, I can rebase this series on top
> of Atish's fw_dynamic.bin support series.

I think fw_dynamic makes the most sense. The order doesn't really
matter, but as we are checking in binaries it might be best to avoid
too much churn and rebase this on top of Atish's patches.

Alistair

>
> Regards,
> Bin
>