mbox

[PULL,v2,00/19] riscv-to-apply queue

Message ID 20210304144651.310037-1-alistair.francis@wdc.com (mailing list archive)
State New, archived
Headers show

Pull-request

git@github.com:alistair23/qemu.git tags/pull-riscv-to-apply-20210304

Message

Alistair Francis March 4, 2021, 2:46 p.m. UTC
The following changes since commit cb90ecf9349198558569f6c86c4c27d215406095:

  Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210304' into staging (2021-03-04 10:42:46 +0000)

are available in the Git repository at:

  git@github.com:alistair23/qemu.git tags/pull-riscv-to-apply-20210304

for you to fetch changes up to 19800265d407f09f333cf80dba3e975eb7bc1872:

  hw/riscv: virt: Map high mmio for PCIe (2021-03-04 09:43:29 -0500)

----------------------------------------------------------------
RISC-V PR for 6.0

This PR is a collection of RISC-V patches:
 - Improvements to SiFive U OTP
 - Upgrade OpenSBI to v0.9
 - Support the QMP dump-guest-memory
 - Add support for the SiFive SPI controller (sifive_u)
 - Initial RISC-V system documentation
 - A fix for the Goldfish RTC
 - MAINTAINERS updates
 - Support for high PCIe memory in the virt machine

----------------------------------------------------------------
Alistair Francis (1):
      MAINTAINERS: Add a SiFive machine section

Bin Meng (16):
      target/riscv: Declare csr_ops[] with a known size
      hw/misc: sifive_u_otp: Use error_report() when block operation fails
      roms/opensbi: Upgrade from v0.8 to v0.9
      hw/block: m25p80: Add ISSI SPI flash support
      hw/block: m25p80: Add various ISSI flash information
      hw/ssi: Add SiFive SPI controller support
      hw/riscv: sifive_u: Add QSPI0 controller and connect a flash
      hw/riscv: sifive_u: Add QSPI2 controller and connect an SD card
      hw/riscv: sifive_u: Change SIFIVE_U_GEM_IRQ to decimal value
      docs/system: Sort targets in alphabetical order
      docs/system: Add RISC-V documentation
      docs/system: riscv: Add documentation for sifive_u machine
      hw/riscv: Drop 'struct MemmapEntry'
      hw/riscv: virt: Drop the 'link_up' parameter of gpex_pcie_init()
      hw/riscv: virt: Limit RAM size in a 32-bit system
      hw/riscv: virt: Map high mmio for PCIe

Laurent Vivier (1):
      goldfish_rtc: re-arm the alarm after migration

Yifei Jiang (1):
      target-riscv: support QMP dump-guest-memory

 docs/system/riscv/sifive_u.rst                 | 336 +++++++++++++++++++++++
 docs/system/target-riscv.rst                   |  72 +++++
 docs/system/targets.rst                        |  20 +-
 include/hw/riscv/sifive_u.h                    |   9 +-
 include/hw/ssi/sifive_spi.h                    |  47 ++++
 target/riscv/cpu.h                             |   6 +-
 target/riscv/cpu_bits.h                        |   1 +
 hw/block/m25p80.c                              |  57 +++-
 hw/misc/sifive_u_otp.c                         |  13 +-
 hw/riscv/microchip_pfsoc.c                     |   9 +-
 hw/riscv/opentitan.c                           |   9 +-
 hw/riscv/sifive_e.c                            |   9 +-
 hw/riscv/sifive_u.c                            | 102 ++++++-
 hw/riscv/spike.c                               |   9 +-
 hw/riscv/virt.c                                |  68 +++--
 hw/rtc/goldfish_rtc.c                          |   2 +
 hw/ssi/sifive_spi.c                            | 358 +++++++++++++++++++++++++
 target/riscv/arch_dump.c                       | 202 ++++++++++++++
 target/riscv/cpu.c                             |   2 +
 MAINTAINERS                                    |   9 +
 hw/riscv/Kconfig                               |   3 +
 hw/ssi/Kconfig                                 |   4 +
 hw/ssi/meson.build                             |   1 +
 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 62144 -> 78680 bytes
 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 558668 -> 727464 bytes
 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 70792 -> 75096 bytes
 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 620424 -> 781264 bytes
 roms/opensbi                                   |   2 +-
 target/riscv/meson.build                       |   1 +
 29 files changed, 1286 insertions(+), 65 deletions(-)
 create mode 100644 docs/system/riscv/sifive_u.rst
 create mode 100644 docs/system/target-riscv.rst
 create mode 100644 include/hw/ssi/sifive_spi.h
 create mode 100644 hw/ssi/sifive_spi.c
 create mode 100644 target/riscv/arch_dump.c

Comments

Peter Maydell March 5, 2021, 3:15 p.m. UTC | #1
On Thu, 4 Mar 2021 at 14:47, Alistair Francis <alistair.francis@wdc.com> wrote:
>
> The following changes since commit cb90ecf9349198558569f6c86c4c27d215406095:
>
>   Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-20210304' into staging (2021-03-04 10:42:46 +0000)
>
> are available in the Git repository at:
>
>   git@github.com:alistair23/qemu.git tags/pull-riscv-to-apply-20210304
>
> for you to fetch changes up to 19800265d407f09f333cf80dba3e975eb7bc1872:
>
>   hw/riscv: virt: Map high mmio for PCIe (2021-03-04 09:43:29 -0500)
>
> ----------------------------------------------------------------
> RISC-V PR for 6.0
>
> This PR is a collection of RISC-V patches:
>  - Improvements to SiFive U OTP
>  - Upgrade OpenSBI to v0.9
>  - Support the QMP dump-guest-memory
>  - Add support for the SiFive SPI controller (sifive_u)
>  - Initial RISC-V system documentation
>  - A fix for the Goldfish RTC
>  - MAINTAINERS updates
>  - Support for high PCIe memory in the virt machine


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM
Philippe Mathieu-Daudé March 9, 2021, 4:51 p.m. UTC | #2
Hi Alistair,

On 3/4/21 3:46 PM, Alistair Francis wrote:
> From: Bin Meng <bin.meng@windriver.com>
> 
> Upgrade OpenSBI from v0.8 to v0.9 and the pre-built bios images.

> Signed-off-by: Bin Meng <bin.meng@windriver.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> Message-Id: 20210119234438.10132-1-bmeng.cn@gmail.com
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  .../opensbi-riscv32-generic-fw_dynamic.bin    | Bin 62144 -> 78680 bytes
>  .../opensbi-riscv32-generic-fw_dynamic.elf    | Bin 558668 -> 727464 bytes
>  .../opensbi-riscv64-generic-fw_dynamic.bin    | Bin 70792 -> 75096 bytes
>  .../opensbi-riscv64-generic-fw_dynamic.elf    | Bin 620424 -> 781264 bytes
>  roms/opensbi                                  |   2 +-
>  5 files changed, 1 insertion(+), 1 deletion(-)

For pull-request you can use git-format-patch with --no-binary:

   --no-binary
           Do not output contents of changes in binary files,
           instead display a notice that those files changed.
           Patches generated using this option cannot be applied
           properly, but they are still useful for code review.

I did the same mistake last year and this broke QEMU patchwork
instance. No sure it is still in use, so Cc'ing Stefan.

> diff --git a/roms/opensbi b/roms/opensbi
> index a98258d0b5..234ed8e427 160000
> --- a/roms/opensbi
> +++ b/roms/opensbi
> @@ -1 +1 @@
> -Subproject commit a98258d0b537a295f517bbc8d813007336731fa9
> +Subproject commit 234ed8e427f4d92903123199f6590d144e0d9351
>
Alistair Francis March 11, 2021, 3:48 p.m. UTC | #3
On Tue, Mar 9, 2021 at 11:51 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> Hi Alistair,
>
> On 3/4/21 3:46 PM, Alistair Francis wrote:
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > Upgrade OpenSBI from v0.8 to v0.9 and the pre-built bios images.
>
> > Signed-off-by: Bin Meng <bin.meng@windriver.com>
> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > Message-Id: 20210119234438.10132-1-bmeng.cn@gmail.com
> > Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> > ---
> >  .../opensbi-riscv32-generic-fw_dynamic.bin    | Bin 62144 -> 78680 bytes
> >  .../opensbi-riscv32-generic-fw_dynamic.elf    | Bin 558668 -> 727464 bytes
> >  .../opensbi-riscv64-generic-fw_dynamic.bin    | Bin 70792 -> 75096 bytes
> >  .../opensbi-riscv64-generic-fw_dynamic.elf    | Bin 620424 -> 781264 bytes
> >  roms/opensbi                                  |   2 +-
> >  5 files changed, 1 insertion(+), 1 deletion(-)
>
> For pull-request you can use git-format-patch with --no-binary:
>
>    --no-binary
>            Do not output contents of changes in binary files,
>            instead display a notice that those files changed.
>            Patches generated using this option cannot be applied
>            properly, but they are still useful for code review.

Thanks, I have updated my script (which is really Peter's script) to add that.

Alistair

>
> I did the same mistake last year and this broke QEMU patchwork
> instance. No sure it is still in use, so Cc'ing Stefan.
>
> > diff --git a/roms/opensbi b/roms/opensbi
> > index a98258d0b5..234ed8e427 160000
> > --- a/roms/opensbi
> > +++ b/roms/opensbi
> > @@ -1 +1 @@
> > -Subproject commit a98258d0b537a295f517bbc8d813007336731fa9
> > +Subproject commit 234ed8e427f4d92903123199f6590d144e0d9351
> >
>