Skip to content

arm: Rework target/ headers to build various hw/ files once

Philippe Mathieu-Daudé kvm qemu-arm qemu-devel 1 version Applied

Status from this message: Applied to target-arm.next, thanks.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest20 patches 4 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/20hw/arm/exynos4210: Include missing 'exec/tswap.h' headerhw/arm/exynos4210.c+1 -00 replies
2/20hw/arm/xilinx_zynq: Include missing 'exec/tswap.h' headerhw/arm/xilinx_zynq.c+1 -00 replies
3/20hw/arm/smmuv3: Include missing 'hw/registerfields.h' headerhw/arm/smmuv3-internal.h+1 -00 replies
4/20hw/arm/xlnx-versal: Include missing 'cpu.h' headerinclude/hw/arm/xlnx-versal.h+1 -00 replies
5/20target/arm/cpu-features: Include missing 'hw/registerfields.h' headertarget/arm/cpu-features.h+2 -00 replies
6/20target/arm/cpregs: Include missing 'hw/registerfields.h' headertarget/arm/cpregs.h+2 -00 replies
7/20target/arm/cpregs: Include missing 'kvm-consts.h' headertarget/arm/cpregs.h+1 -00 replies
8/20target/arm: Rename arm_cpu_mp_affinityhw/arm/npcm7xx.c hw/arm/sbsa-ref.c hw/arm/virt.c +2 more+7 -71 reply
9/20target/arm: Create arm_cpu_mp_affinityhw/arm/virt-acpi-build.c hw/arm/virt.c hw/arm/xlnx-versal-virt.c +5 more+17 -110 replies
10/20target/arm: Expose arm_cpu_mp_affinity() in 'multiprocessing.h' headerhw/arm/virt-acpi-build.c hw/arm/virt.c hw/arm/xlnx-versal-virt.c +7 more+29 -50 replies
11/20target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h'target/arm/cpu-qom.h target/arm/cpu.h+3 -20 replies
12/20hw/cpu/a9mpcore: Build it only oncehw/cpu/a9mpcore.c hw/cpu/meson.build+2 -20 replies
13/20hw/misc/xlnx-versal-crl: Include generic 'cpu-qom.h' instead of 'cpu.h'hw/misc/xlnx-versal-crl.c include/hw/misc/xlnx-versal-crl.h+2 -10 replies
14/20hw/misc/xlnx-versal-crl: Build it only oncehw/misc/meson.build hw/misc/xlnx-versal-crl.c+1 -20 replies
15/20target/arm: Expose M-profile register bank index definitionstarget/arm/cpu-qom.h target/arm/cpu.h+15 -150 replies
16/20hw/arm/armv7m: Make 'hw/intc/armv7m_nvic.h' a target agnostic headerhw/arm/armv7m.c include/hw/intc/armv7m_nvic.h+2 -10 replies
17/20target/arm: Move ARM_CPU_IRQ/FIQ definitions to 'cpu-qom.h' headerhw/arm/allwinner-a10.c hw/arm/allwinner-h3.c hw/arm/allwinner-r40.c +28 more+35 -60 replies
18/20target/arm: Move e2h_access() helper aroundtarget/arm/helper.c+15 -140 replies
19/20target/arm: Move GTimer definitions to new 'gtimer.h' headerhw/arm/allwinner-h3.c hw/arm/allwinner-r40.c hw/arm/bcm2836.c +12 more+35 -70 replies
20/20hw/arm: Build various units only oncehw/arm/collie.c hw/arm/gumstix.c hw/arm/integratorcp.c +14 more+12 -270 replies

Reviews trailers per patch

1 of 20 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchRichard Henderson
SeriesR-b
1/20
2/20
3/20
4/20
5/20
6/20
7/20
8/20
9/20
10/20
11/20R-b
12/20
13/20
14/20
15/20
16/20
17/20
18/20
19/20
20/20

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/20] arm: Rework target/ headers to build various hw/ files once

Hi,

In order to fix a bug noticed [*] by Cédric and Fabiano in my "Remove one use of qemu_get_cpu() in A7/A15 MPCore priv" series, I ended reusing commits from other branches and it grew quite a lot. This is the first "cleanup" part, unrelated on MPCorePriv.

Please review,

Phil.

Philippe Mathieu-Daudé (18):
hw/arm/exynos4210: Include missing 'exec/tswap.h' header hw/arm/xilinx_zynq: Include missing 'exec/tswap.h' header hw/arm/smmuv3: Include missing 'hw/registerfields.h' header hw/arm/xlnx-versal: Include missing 'cpu.h' header target/arm/cpu-features: Include missing 'hw/registerfields.h' header target/arm/cpregs: Include missing 'hw/registerfields.h' header target/arm/cpregs: Include missing 'kvm-consts.h' header target/arm: Expose arm_cpu_mp_affinity() in 'multiprocessing.h' header target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h' hw/cpu/a9mpcore: Build it only once hw/misc/xlnx-versal-crl: Include generic 'cpu-qom.h' instead of

    'cpu.h'

hw/misc/xlnx-versal-crl: Build it only once
target/arm: Expose M-profile register bank index definitions hw/arm/armv7m: Make 'hw/intc/armv7m_nvic.h' a target agnostic header target/arm: Move ARM_CPU_IRQ/FIQ definitions to 'cpu-qom.h' header target/arm: Move e2h_access() helper around
target/arm: Move GTimer definitions to new 'gtimer.h' header hw/arm: Build various units only once

Richard Henderson (2):
target/arm: Rename arm_cpu_mp_affinity
target/arm: Create arm_cpu_mp_affinity

 hw/arm/smmuv3-internal.h          |  1 +
 include/hw/arm/xlnx-versal.h      |  1 +
 include/hw/intc/armv7m_nvic.h     |  2 +-
 include/hw/misc/xlnx-versal-crl.h |  2 +-
 target/arm/cpregs.h               |  3 +++
 target/arm/cpu-features.h         |  2 ++
 target/arm/cpu-qom.h              | 24 ++++++++++++++++++++++
 target/arm/cpu.h                  | 34 +++----------------------------
 target/arm/gtimer.h               | 21 +++++++++++++++++++
 target/arm/multiprocessing.h      | 16 +++++++++++++++
 hw/arm/allwinner-a10.c            |  1 +
 hw/arm/allwinner-h3.c             |  2 ++
 hw/arm/allwinner-r40.c            |  2 ++
 hw/arm/armv7m.c                   |  2 ++
 hw/arm/aspeed_ast2400.c           |  1 +
 hw/arm/aspeed_ast2600.c           |  1 +
 hw/arm/bcm2836.c                  |  2 ++
 hw/arm/collie.c                   |  1 -
 hw/arm/exynos4210.c               |  2 ++
 hw/arm/fsl-imx25.c                |  1 +
 hw/arm/fsl-imx31.c                |  1 +
 hw/arm/fsl-imx6.c                 |  1 +
 hw/arm/fsl-imx6ul.c               |  1 +
 hw/arm/fsl-imx7.c                 |  1 +
 hw/arm/gumstix.c                  |  1 -
 hw/arm/highbank.c                 |  1 +
 hw/arm/integratorcp.c             |  2 +-
 hw/arm/mainstone.c                |  1 -
 hw/arm/musicpal.c                 |  2 +-
 hw/arm/npcm7xx.c                  |  3 ++-
 hw/arm/omap1.c                    |  1 +
 hw/arm/omap2.c                    |  2 +-
 hw/arm/omap_sx1.c                 |  1 -
 hw/arm/palm.c                     |  1 -
 hw/arm/realview.c                 |  1 +
 hw/arm/sbsa-ref.c                 |  4 +++-
 hw/arm/spitz.c                    |  1 -
 hw/arm/strongarm.c                |  2 +-
 hw/arm/versatilepb.c              |  2 +-
 hw/arm/vexpress.c                 |  2 +-
 hw/arm/virt-acpi-build.c          |  4 ++--
 hw/arm/virt.c                     | 11 ++++++----
 hw/arm/xilinx_zynq.c              |  3 ++-
 hw/arm/xlnx-versal-virt.c         |  5 +++--
 hw/arm/xlnx-versal.c              |  2 ++
 hw/arm/xlnx-zynqmp.c              |  2 ++
 hw/arm/z2.c                       |  1 -
 hw/cpu/a15mpcore.c                |  1 +
 hw/cpu/a9mpcore.c                 |  2 +-
 hw/misc/xlnx-versal-crl.c         |  5 +++--
 target/arm/arm-powerctl.c         |  3 ++-
 target/arm/cpu.c                  | 13 +++++++++---
 target/arm/helper.c               | 30 ++++++++++++++-------------
 target/arm/hvf/hvf.c              |  6 ++++--
 target/arm/kvm.c                  |  1 +
 target/arm/machine.c              |  1 +
 target/arm/tcg/psci.c             |  3 ++-
 hw/arm/meson.build                | 23 +++++++++++----------
 hw/cpu/meson.build                |  2 +-
 hw/misc/meson.build               |  2 +-
 60 files changed, 178 insertions(+), 94 deletions(-)
 create mode 100644 target/arm/gtimer.h
 create mode 100644 target/arm/multiprocessing.h
Signature · 1 line
2.41.0