[PULL 00/11] riscv-to-apply queue

alistair23@gmail.com posted 11 patches 3 months, 2 weeks ago
Failed in applying to current master (apply log)
There is a newer version of this series
hw/intc/riscv_aplic.c                   |   6 +-
hw/riscv/virt-acpi-build.c              |  25 +--
target/riscv/csr.c                      |  15 +-
target/riscv/op_helper.c                |  15 +-
target/riscv/pmp.c                      |   7 +-
target/riscv/insn_trans/trans_rvv.c.inc | 323 +++++---------------------------
linux-user/strace.list                  |   3 +
tests/data/acpi/riscv64/virt/APIC       | Bin 116 -> 116 bytes
tests/data/acpi/riscv64/virt/FACP       | Bin 276 -> 276 bytes
9 files changed, 90 insertions(+), 304 deletions(-)
[PULL 00/11] riscv-to-apply queue
Posted by alistair23@gmail.com 3 months, 2 weeks ago
From: Alistair Francis <alistair.francis@wdc.com>

The following changes since commit 9b80226ece693197af8a981b424391b68b5bc38e:

  Update version for the v10.1.0-rc1 release (2025-07-29 13:00:41 -0400)

are available in the Git repository at:

  https://github.com/alistair23/qemu.git tags/pull-riscv-to-apply-20250730-2

for you to fetch changes up to 86bc3a0abf10072081cddd8dff25aa72c60e67b8:

  target/riscv: Restrict midelegh access to S-mode harts (2025-07-30 10:59:26 +1000)

----------------------------------------------------------------
Third RISC-V PR for 10.1

* Fix pmp range wraparound on zero
* Update FADT and MADT versions in ACPI tables
* Fix target register read when source is inactive
* Add riscv_hwprobe entry to linux-user strace list
* Do not call GETPC() in check_ret_from_m_mode()
* Revert "Generate strided vector loads/stores with tcg nodes."
* Fix exception type when VU accesses supervisor CSRs
* Restrict mideleg/medeleg/medelegh access to S-mode harts
* Restrict midelegh access to S-mode harts

----------------------------------------------------------------
Daniel Henrique Barboza (3):
      linux-user/strace.list: add riscv_hwprobe entry
      target/riscv: do not call GETPC() in check_ret_from_m_mode()
      riscv: Revert "Generate strided vector loads/stores with tcg nodes."

Jay Chang (2):
      target/riscv: Restrict mideleg/medeleg/medelegh access to S-mode harts
      target/riscv: Restrict midelegh access to S-mode harts

Sunil V L (3):
      bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changes
      hw/riscv/virt-acpi-build.c: Update FADT and MADT versions
      tests/data/acpi/riscv64: Update expected FADT and MADT

Vac Chen (1):
      target/riscv: Fix pmp range wraparound on zero

Xu Lu (1):
      target/riscv: Fix exception type when VU accesses supervisor CSRs

Yang Jialong (1):
      intc/riscv_aplic: Fix target register read when source is inactive

 hw/intc/riscv_aplic.c                   |   6 +-
 hw/riscv/virt-acpi-build.c              |  25 +--
 target/riscv/csr.c                      |  15 +-
 target/riscv/op_helper.c                |  15 +-
 target/riscv/pmp.c                      |   7 +-
 target/riscv/insn_trans/trans_rvv.c.inc | 323 +++++---------------------------
 linux-user/strace.list                  |   3 +
 tests/data/acpi/riscv64/virt/APIC       | Bin 116 -> 116 bytes
 tests/data/acpi/riscv64/virt/FACP       | Bin 276 -> 276 bytes
 9 files changed, 90 insertions(+), 304 deletions(-)
Re: [PULL 00/11] riscv-to-apply queue
Posted by Stefan Hajnoczi 3 months, 2 weeks ago
Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/10.1 for any user-visible changes.
Re: [PULL 00/11] riscv-to-apply queue
Posted by Michael Tokarev 3 months, 2 weeks ago
On 30.07.2025 04:01, alistair23@gmail.com wrote:
> From: Alistair Francis <alistair.francis@wdc.com>
> 
> The following changes since commit 9b80226ece693197af8a981b424391b68b5bc38e:
> 
>    Update version for the v10.1.0-rc1 release (2025-07-29 13:00:41 -0400)
> 
> are available in the Git repository at:
> 
>    https://github.com/alistair23/qemu.git tags/pull-riscv-to-apply-20250730-2
> 
> for you to fetch changes up to 86bc3a0abf10072081cddd8dff25aa72c60e67b8:
> 
>    target/riscv: Restrict midelegh access to S-mode harts (2025-07-30 10:59:26 +1000)
> 
> ----------------------------------------------------------------
> Third RISC-V PR for 10.1
> 
> * Fix pmp range wraparound on zero
> * Update FADT and MADT versions in ACPI tables
> * Fix target register read when source is inactive
> * Add riscv_hwprobe entry to linux-user strace list
> * Do not call GETPC() in check_ret_from_m_mode()
> * Revert "Generate strided vector loads/stores with tcg nodes."
> * Fix exception type when VU accesses supervisor CSRs
> * Restrict mideleg/medeleg/medelegh access to S-mode harts
> * Restrict midelegh access to S-mode harts
> 
> ----------------------------------------------------------------
> Daniel Henrique Barboza (3):
>        linux-user/strace.list: add riscv_hwprobe entry
>        target/riscv: do not call GETPC() in check_ret_from_m_mode()
>        riscv: Revert "Generate strided vector loads/stores with tcg nodes."
> 
> Jay Chang (2):
>        target/riscv: Restrict mideleg/medeleg/medelegh access to S-mode harts
>        target/riscv: Restrict midelegh access to S-mode harts
> 
> Sunil V L (3):
>        bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changes
>        hw/riscv/virt-acpi-build.c: Update FADT and MADT versions
>        tests/data/acpi/riscv64: Update expected FADT and MADT
> 
> Vac Chen (1):
>        target/riscv: Fix pmp range wraparound on zero
> 
> Xu Lu (1):
>        target/riscv: Fix exception type when VU accesses supervisor CSRs
> 
> Yang Jialong (1):
>        intc/riscv_aplic: Fix target register read when source is inactive

Is there anything there for qemu-stable?

It looks like "Fix exception type when VU accesses supervisor CSRs" is a
good candidate, maybe "Fix pmp range wraparound on zero" too.  Something
else? "Fix target register read when source is inactive"?  The "S-mode
harts" ones?

I already picked up "do not call GETPC()" as it's been Cc'd qemu-stable
before, and I'm picking up riscv_hwprobe too, as it's trivial and fixes
a trivial omission which might be useful.  Should I pick up others I
mentioned?

Thanks,

/mjt
Re: [PULL 00/11] riscv-to-apply queue
Posted by Alistair Francis 3 months, 2 weeks ago
On Thu, Jul 31, 2025 at 4:20 AM Michael Tokarev <mjt@tls.msk.ru> wrote:
>
> On 30.07.2025 04:01, alistair23@gmail.com wrote:
> > From: Alistair Francis <alistair.francis@wdc.com>
> >
> > The following changes since commit 9b80226ece693197af8a981b424391b68b5bc38e:
> >
> >    Update version for the v10.1.0-rc1 release (2025-07-29 13:00:41 -0400)
> >
> > are available in the Git repository at:
> >
> >    https://github.com/alistair23/qemu.git tags/pull-riscv-to-apply-20250730-2
> >
> > for you to fetch changes up to 86bc3a0abf10072081cddd8dff25aa72c60e67b8:
> >
> >    target/riscv: Restrict midelegh access to S-mode harts (2025-07-30 10:59:26 +1000)
> >
> > ----------------------------------------------------------------
> > Third RISC-V PR for 10.1
> >
> > * Fix pmp range wraparound on zero
> > * Update FADT and MADT versions in ACPI tables
> > * Fix target register read when source is inactive
> > * Add riscv_hwprobe entry to linux-user strace list
> > * Do not call GETPC() in check_ret_from_m_mode()
> > * Revert "Generate strided vector loads/stores with tcg nodes."
> > * Fix exception type when VU accesses supervisor CSRs
> > * Restrict mideleg/medeleg/medelegh access to S-mode harts
> > * Restrict midelegh access to S-mode harts
> >
> > ----------------------------------------------------------------
> > Daniel Henrique Barboza (3):
> >        linux-user/strace.list: add riscv_hwprobe entry
> >        target/riscv: do not call GETPC() in check_ret_from_m_mode()
> >        riscv: Revert "Generate strided vector loads/stores with tcg nodes."
> >
> > Jay Chang (2):
> >        target/riscv: Restrict mideleg/medeleg/medelegh access to S-mode harts
> >        target/riscv: Restrict midelegh access to S-mode harts
> >
> > Sunil V L (3):
> >        bios-tables-test-allowed-diff.h: Allow RISC-V FADT and MADT changes
> >        hw/riscv/virt-acpi-build.c: Update FADT and MADT versions
> >        tests/data/acpi/riscv64: Update expected FADT and MADT
> >
> > Vac Chen (1):
> >        target/riscv: Fix pmp range wraparound on zero
> >
> > Xu Lu (1):
> >        target/riscv: Fix exception type when VU accesses supervisor CSRs
> >
> > Yang Jialong (1):
> >        intc/riscv_aplic: Fix target register read when source is inactive
>
> Is there anything there for qemu-stable?

Urgh, sorry I forgot to CC qemu-stable.

>
> It looks like "Fix exception type when VU accesses supervisor CSRs" is a
> good candidate, maybe "Fix pmp range wraparound on zero" too.  Something
> else? "Fix target register read when source is inactive"?  The "S-mode
> harts" ones?
>
> I already picked up "do not call GETPC()" as it's been Cc'd qemu-stable
> before, and I'm picking up riscv_hwprobe too, as it's trivial and fixes
> a trivial omission which might be useful.  Should I pick up others I
> mentioned?

Thanks for getting those two

77707bfdf8 target/riscv: Fix pmp range wraparound on zero
b6f1244678 intc/riscv_aplic: Fix target register read when source is inactive
30ef718423 target/riscv: Fix exception type when VU accesses supervisor CSRs
e443ba0336 target/riscv: Restrict mideleg/medeleg/medelegh access to
S-mode harts
86bc3a0abf target/riscv: Restrict midelegh access to S-mode harts

Are all good candidates for back porting as well

Alistair

>
> Thanks,
>
> /mjt
Re: [PULL 00/11] riscv-to-apply queue
Posted by Michael Tokarev 3 months, 2 weeks ago
On 31.07.2025 07:36, Alistair Francis wrote:
..
> Urgh, sorry I forgot to CC qemu-stable.

This is okay :)

..
> Are all good candidates for back porting as well

And thank you for the good work!

I've picked these up for 10.0 (for 7.2 it's more
difficult, and riscv support there is significantly
lacking anyway).

/mjt
Re: [PULL 00/11] riscv-to-apply queue
Posted by Alistair Francis 3 months, 2 weeks ago
On Wed, Jul 30, 2025 at 11:01 AM <alistair23@gmail.com> wrote:
>
> From: Alistair Francis <alistair.francis@wdc.com>
>
> The following changes since commit 9b80226ece693197af8a981b424391b68b5bc38e:
>
>   Update version for the v10.1.0-rc1 release (2025-07-29 13:00:41 -0400)
>
> are available in the Git repository at:
>
>   https://github.com/alistair23/qemu.git tags/pull-riscv-to-apply-20250730-2
>
> for you to fetch changes up to 86bc3a0abf10072081cddd8dff25aa72c60e67b8:
>
>   target/riscv: Restrict midelegh access to S-mode harts (2025-07-30 10:59:26 +1000)
>
> ----------------------------------------------------------------
> Third RISC-V PR for 10.1
>
> * Fix pmp range wraparound on zero
> * Update FADT and MADT versions in ACPI tables
> * Fix target register read when source is inactive
> * Add riscv_hwprobe entry to linux-user strace list
> * Do not call GETPC() in check_ret_from_m_mode()
> * Revert "Generate strided vector loads/stores with tcg nodes."
> * Fix exception type when VU accesses supervisor CSRs
> * Restrict mideleg/medeleg/medelegh access to S-mode harts
> * Restrict midelegh access to S-mode harts

Sorry about this being so large and late in the cycle. I just got back
from parental leave and wanted to get these fixes in for 10.1

Alistair