mbox

[PULL,00/32] target-arm queue

Message ID 20250506144214.1221450-1-peter.maydell@linaro.org
State Not Applicable
Headers show

Pull-request

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20250506

Message

Peter Maydell May 6, 2025, 2:41 p.m. UTC
Now I'm back from holiday, here's a target-arm pullreq :-)

thanks
-- PMM

The following changes since commit a9e0c9c0f14e19d23443ac24c8080b4708d2eab8:

  Merge tag 'pull-9p-20250505' of https://github.com/cschoenebeck/qemu into staging (2025-05-05 11:26:59 -0400)

are available in the Git repository at:

  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20250506

for you to fetch changes up to 607e1208b53ac713a76d158f4abc4cd2e8870051:

  hw/arm/virt: Remove deprecated virt-4.0 machine (2025-05-06 15:02:35 +0100)

----------------------------------------------------------------
target-arm queue:
 * hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC
 * arm/hvf: fix crashes when using gdbstub
 * target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug
 * hw/arm/virt: Remove deprecated old versions of 'virt' machine
 * tests/functional: Add test for imx8mp-evk board with USDHC coverage
 * hw/arm: Attach PSPI module to NPCM8XX SoC
 * target/arm: Don't assert() for ISB/SB inside IT block
 * docs: Don't define duplicate label in qemu-block-drivers.rst.inc
 * target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET
 * hw/pci-host/designware: Fix viewport configuration
 * hw/gpio/imx_gpio: Fix interpretation of GDIR polarity

----------------------------------------------------------------
Bernhard Beschow (4):
      tests/functional: Add test for imx8mp-evk board with USDHC coverage
      hw/pci-host/designware: Remove unused include
      hw/pci-host/designware: Fix viewport configuration
      hw/gpio/imx_gpio: Fix interpretation of GDIR polarity

Mads Ynddal (2):
      hvf: avoid repeatedly setting trap debug for each cpu
      hvf: only update sysreg from owning thread

Peter Maydell (3):
      target/arm: Don't assert() for ISB/SB inside IT block
      docs: Don't define duplicate label in qemu-block-drivers.rst.inc
      target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET

Philippe Mathieu-Daudé (17):
      hw/arm/virt: Remove deprecated virt-2.6 machine
      hw/arm/virt: Remove VirtMachineClass::no_pmu field
      hw/arm/virt: Remove VirtMachineClass::disallow_affinity_adjustment
      hw/arm/virt: Remove deprecated virt-2.7 machine
      hw/arm/virt: Remove VirtMachineClass::no_its field
      hw/arm/virt: Remove deprecated virt-2.8 machine
      hw/arm/virt: Remove VirtMachineClass::claim_edge_triggered_timers field
      hw/arm/virt: Remove deprecated virt-2.9 machine
      hw/arm/virt: Remove deprecated virt-2.10 machine
      hw/arm/virt: Remove deprecated virt-2.11 machine
      hw/arm/virt: Remove VirtMachineClass::smbios_old_sys_ver field
      hw/arm/virt: Remove deprecated virt-2.12 machine
      hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field
      hw/arm/virt: Update comment about Multiprocessor Affinity Register
      hw/arm/virt: Remove deprecated virt-3.0 machine
      hw/arm/virt: Remove deprecated virt-3.1 machine
      hw/arm/virt: Remove deprecated virt-4.0 machine

Pierrick Bouvier (4):
      target/arm/ptw: extract arm_mmu_idx_to_security_space
      target/arm/ptw: get current security_space for current mmu_idx
      target/arm/ptw: extract arm_cpu_get_phys_page
      target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug

Tim Lee (2):
      hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC
      hw/arm: Attach PSPI module to NPCM8XX SoC

 MAINTAINERS                                 |   1 +
 docs/devel/codebase.rst                     |   2 +-
 docs/system/qemu-block-drivers.rst.inc      |   2 -
 include/hw/arm/npcm8xx.h                    |   2 +
 include/hw/arm/virt.h                       |   6 --
 target/arm/kvm_arm.h                        |   7 +-
 accel/hvf/hvf-all.c                         |   7 +-
 hw/arm/npcm8xx.c                            |  11 +-
 hw/arm/npcm8xx_boards.c                     |   2 +-
 hw/arm/virt-acpi-build.c                    |  10 +-
 hw/arm/virt.c                               | 153 ++++------------------------
 hw/gpio/imx_gpio.c                          |   2 +-
 hw/pci-host/designware.c                    |   5 +-
 target/arm/arm-qmp-cmds.c                   |   2 +-
 target/arm/hvf/hvf.c                        |  27 ++---
 target/arm/kvm.c                            |  55 ++--------
 target/arm/ptw.c                            |  71 +++++++++----
 target/arm/tcg/translate.c                  |   3 +-
 tests/functional/meson.build                |   2 +
 tests/functional/test_aarch64_imx8mp_evk.py |  67 ++++++++++++
 20 files changed, 188 insertions(+), 249 deletions(-)
 create mode 100755 tests/functional/test_aarch64_imx8mp_evk.py

Comments

Stefan Hajnoczi May 7, 2025, 2:05 p.m. UTC | #1
On Tue, May 6, 2025 at 10:52 AM Peter Maydell <peter.maydell@linaro.org> wrote:
>
> Now I'm back from holiday, here's a target-arm pullreq :-)
>
> thanks
> -- PMM
>
> The following changes since commit a9e0c9c0f14e19d23443ac24c8080b4708d2eab8:
>
>   Merge tag 'pull-9p-20250505' of https://github.com/cschoenebeck/qemu into staging (2025-05-05 11:26:59 -0400)
>
> are available in the Git repository at:
>
>   https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20250506
>
> for you to fetch changes up to 607e1208b53ac713a76d158f4abc4cd2e8870051:
>
>   hw/arm/virt: Remove deprecated virt-4.0 machine (2025-05-06 15:02:35 +0100)
>
> ----------------------------------------------------------------
> target-arm queue:
>  * hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC
>  * arm/hvf: fix crashes when using gdbstub
>  * target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug
>  * hw/arm/virt: Remove deprecated old versions of 'virt' machine
>  * tests/functional: Add test for imx8mp-evk board with USDHC coverage
>  * hw/arm: Attach PSPI module to NPCM8XX SoC
>  * target/arm: Don't assert() for ISB/SB inside IT block
>  * docs: Don't define duplicate label in qemu-block-drivers.rst.inc
>  * target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET
>  * hw/pci-host/designware: Fix viewport configuration
>  * hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>
> ----------------------------------------------------------------
> Bernhard Beschow (4):
>       tests/functional: Add test for imx8mp-evk board with USDHC coverage
>       hw/pci-host/designware: Remove unused include
>       hw/pci-host/designware: Fix viewport configuration
>       hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>
> Mads Ynddal (2):
>       hvf: avoid repeatedly setting trap debug for each cpu
>       hvf: only update sysreg from owning thread

Please take a look at the following aarch64 macOS CI failure:

../accel/hvf/hvf-all.c:61:54: error: unknown type name 'run_on_cpu_data'
61 | static void do_hvf_update_guest_debug(CPUState *cpu, run_on_cpu_data arg)
| ^
../accel/hvf/hvf-all.c:68:5: error: call to undeclared function
'run_on_cpu'; ISO C99 and later do not support implicit function
declarations [-Wimplicit-function-declaration]
68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
| ^
../accel/hvf/hvf-all.c:68:48: error: use of undeclared identifier
'RUN_ON_CPU_NULL'
68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
| ^
3 errors generated.

https://gitlab.com/qemu-project/qemu/-/jobs/9962088576

>
> Peter Maydell (3):
>       target/arm: Don't assert() for ISB/SB inside IT block
>       docs: Don't define duplicate label in qemu-block-drivers.rst.inc
>       target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET
>
> Philippe Mathieu-Daudé (17):
>       hw/arm/virt: Remove deprecated virt-2.6 machine
>       hw/arm/virt: Remove VirtMachineClass::no_pmu field
>       hw/arm/virt: Remove VirtMachineClass::disallow_affinity_adjustment
>       hw/arm/virt: Remove deprecated virt-2.7 machine
>       hw/arm/virt: Remove VirtMachineClass::no_its field
>       hw/arm/virt: Remove deprecated virt-2.8 machine
>       hw/arm/virt: Remove VirtMachineClass::claim_edge_triggered_timers field
>       hw/arm/virt: Remove deprecated virt-2.9 machine
>       hw/arm/virt: Remove deprecated virt-2.10 machine
>       hw/arm/virt: Remove deprecated virt-2.11 machine
>       hw/arm/virt: Remove VirtMachineClass::smbios_old_sys_ver field
>       hw/arm/virt: Remove deprecated virt-2.12 machine
>       hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field
>       hw/arm/virt: Update comment about Multiprocessor Affinity Register
>       hw/arm/virt: Remove deprecated virt-3.0 machine
>       hw/arm/virt: Remove deprecated virt-3.1 machine
>       hw/arm/virt: Remove deprecated virt-4.0 machine
>
> Pierrick Bouvier (4):
>       target/arm/ptw: extract arm_mmu_idx_to_security_space
>       target/arm/ptw: get current security_space for current mmu_idx
>       target/arm/ptw: extract arm_cpu_get_phys_page
>       target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug
>
> Tim Lee (2):
>       hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC
>       hw/arm: Attach PSPI module to NPCM8XX SoC
>
>  MAINTAINERS                                 |   1 +
>  docs/devel/codebase.rst                     |   2 +-
>  docs/system/qemu-block-drivers.rst.inc      |   2 -
>  include/hw/arm/npcm8xx.h                    |   2 +
>  include/hw/arm/virt.h                       |   6 --
>  target/arm/kvm_arm.h                        |   7 +-
>  accel/hvf/hvf-all.c                         |   7 +-
>  hw/arm/npcm8xx.c                            |  11 +-
>  hw/arm/npcm8xx_boards.c                     |   2 +-
>  hw/arm/virt-acpi-build.c                    |  10 +-
>  hw/arm/virt.c                               | 153 ++++------------------------
>  hw/gpio/imx_gpio.c                          |   2 +-
>  hw/pci-host/designware.c                    |   5 +-
>  target/arm/arm-qmp-cmds.c                   |   2 +-
>  target/arm/hvf/hvf.c                        |  27 ++---
>  target/arm/kvm.c                            |  55 ++--------
>  target/arm/ptw.c                            |  71 +++++++++----
>  target/arm/tcg/translate.c                  |   3 +-
>  tests/functional/meson.build                |   2 +
>  tests/functional/test_aarch64_imx8mp_evk.py |  67 ++++++++++++
>  20 files changed, 188 insertions(+), 249 deletions(-)
>  create mode 100755 tests/functional/test_aarch64_imx8mp_evk.py
>
Philippe Mathieu-Daudé May 7, 2025, 2:57 p.m. UTC | #2
On 7/5/25 16:05, Stefan Hajnoczi wrote:
> On Tue, May 6, 2025 at 10:52 AM Peter Maydell <peter.maydell@linaro.org> wrote:
>>
>> Now I'm back from holiday, here's a target-arm pullreq :-)
>>
>> thanks
>> -- PMM
>>
>> The following changes since commit a9e0c9c0f14e19d23443ac24c8080b4708d2eab8:
>>
>>    Merge tag 'pull-9p-20250505' of https://github.com/cschoenebeck/qemu into staging (2025-05-05 11:26:59 -0400)
>>
>> are available in the Git repository at:
>>
>>    https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20250506
>>
>> for you to fetch changes up to 607e1208b53ac713a76d158f4abc4cd2e8870051:
>>
>>    hw/arm/virt: Remove deprecated virt-4.0 machine (2025-05-06 15:02:35 +0100)
>>
>> ----------------------------------------------------------------
>> target-arm queue:
>>   * hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC
>>   * arm/hvf: fix crashes when using gdbstub
>>   * target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug
>>   * hw/arm/virt: Remove deprecated old versions of 'virt' machine
>>   * tests/functional: Add test for imx8mp-evk board with USDHC coverage
>>   * hw/arm: Attach PSPI module to NPCM8XX SoC
>>   * target/arm: Don't assert() for ISB/SB inside IT block
>>   * docs: Don't define duplicate label in qemu-block-drivers.rst.inc
>>   * target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET
>>   * hw/pci-host/designware: Fix viewport configuration
>>   * hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>>
>> ----------------------------------------------------------------
>> Bernhard Beschow (4):
>>        tests/functional: Add test for imx8mp-evk board with USDHC coverage
>>        hw/pci-host/designware: Remove unused include
>>        hw/pci-host/designware: Fix viewport configuration
>>        hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>>
>> Mads Ynddal (2):
>>        hvf: avoid repeatedly setting trap debug for each cpu
>>        hvf: only update sysreg from owning thread
> 
> Please take a look at the following aarch64 macOS CI failure:
> 
> ../accel/hvf/hvf-all.c:61:54: error: unknown type name 'run_on_cpu_data'
> 61 | static void do_hvf_update_guest_debug(CPUState *cpu, run_on_cpu_data arg)
> | ^
> ../accel/hvf/hvf-all.c:68:5: error: call to undeclared function
> 'run_on_cpu'; ISO C99 and later do not support implicit function
> declarations [-Wimplicit-function-declaration]
> 68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
> | ^
> ../accel/hvf/hvf-all.c:68:48: error: use of undeclared identifier
> 'RUN_ON_CPU_NULL'
> 68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
> | ^
> 3 errors generated.
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/9962088576

"hvf: only update sysreg from owning thread" missing:

-- >8 --
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index 3fc65d6b231..8c387fda24d 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -12,6 +12,7 @@
  #include "qemu/error-report.h"
  #include "system/hvf.h"
  #include "system/hvf_int.h"
+#include "hw/core/cpu.h"

  const char *hvf_return_string(hv_return_t ret)
  {
---
Philippe Mathieu-Daudé May 7, 2025, 3:16 p.m. UTC | #3
On 7/5/25 16:57, Philippe Mathieu-Daudé wrote:
> On 7/5/25 16:05, Stefan Hajnoczi wrote:
>> On Tue, May 6, 2025 at 10:52 AM Peter Maydell 
>> <peter.maydell@linaro.org> wrote:
>>>
>>> Now I'm back from holiday, here's a target-arm pullreq :-)
>>>
>>> thanks
>>> -- PMM
>>>
>>> The following changes since commit 
>>> a9e0c9c0f14e19d23443ac24c8080b4708d2eab8:
>>>
>>>    Merge tag 'pull-9p-20250505' of https://github.com/cschoenebeck/ 
>>> qemu into staging (2025-05-05 11:26:59 -0400)
>>>
>>> are available in the Git repository at:
>>>
>>>    https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull- 
>>> target-arm-20250506
>>>
>>> for you to fetch changes up to 607e1208b53ac713a76d158f4abc4cd2e8870051:
>>>
>>>    hw/arm/virt: Remove deprecated virt-4.0 machine (2025-05-06 
>>> 15:02:35 +0100)
>>>
>>> ----------------------------------------------------------------
>>> target-arm queue:
>>>   * hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX 
>>> SoC
>>>   * arm/hvf: fix crashes when using gdbstub
>>>   * target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug
>>>   * hw/arm/virt: Remove deprecated old versions of 'virt' machine
>>>   * tests/functional: Add test for imx8mp-evk board with USDHC coverage
>>>   * hw/arm: Attach PSPI module to NPCM8XX SoC
>>>   * target/arm: Don't assert() for ISB/SB inside IT block
>>>   * docs: Don't define duplicate label in qemu-block-drivers.rst.inc
>>>   * target/arm/kvm: Drop support for kernels without 
>>> KVM_ARM_PREFERRED_TARGET
>>>   * hw/pci-host/designware: Fix viewport configuration
>>>   * hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>>>
>>> ----------------------------------------------------------------
>>> Bernhard Beschow (4):
>>>        tests/functional: Add test for imx8mp-evk board with USDHC 
>>> coverage
>>>        hw/pci-host/designware: Remove unused include
>>>        hw/pci-host/designware: Fix viewport configuration
>>>        hw/gpio/imx_gpio: Fix interpretation of GDIR polarity
>>>
>>> Mads Ynddal (2):
>>>        hvf: avoid repeatedly setting trap debug for each cpu
>>>        hvf: only update sysreg from owning thread
>>
>> Please take a look at the following aarch64 macOS CI failure:
>>
>> ../accel/hvf/hvf-all.c:61:54: error: unknown type name 'run_on_cpu_data'
>> 61 | static void do_hvf_update_guest_debug(CPUState *cpu, 
>> run_on_cpu_data arg)
>> | ^
>> ../accel/hvf/hvf-all.c:68:5: error: call to undeclared function
>> 'run_on_cpu'; ISO C99 and later do not support implicit function
>> declarations [-Wimplicit-function-declaration]
>> 68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
>> | ^
>> ../accel/hvf/hvf-all.c:68:48: error: use of undeclared identifier
>> 'RUN_ON_CPU_NULL'
>> 68 | run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL);
>> | ^
>> 3 errors generated.
>>
>> https://gitlab.com/qemu-project/qemu/-/jobs/9962088576
> 
> "hvf: only update sysreg from owning thread" missing:
> 
> -- >8 --
> diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
> index 3fc65d6b231..8c387fda24d 100644
> --- a/accel/hvf/hvf-all.c
> +++ b/accel/hvf/hvf-all.c
> @@ -12,6 +12,7 @@
>   #include "qemu/error-report.h"
>   #include "system/hvf.h"
>   #include "system/hvf_int.h"
> +#include "hw/core/cpu.h"
> 
>   const char *hvf_return_string(hv_return_t ret)
>   {
> ---

Note, this is likely exposed (side effect) by:
https://lore.kernel.org/qemu-devel/20250506143512.4315-7-philmd@linaro.org/
Stefan Hajnoczi May 7, 2025, 8:10 p.m. UTC | #4
Applied, thanks.

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