Link to branch: https://github.com/mediouni-m/qemu hvf-irqchip-and-nested
(tag for this submission: hvf-irqchip-and-nested-v7)
This series adds supports for nested virtualisation when using HVF on arm64 Macs.
It has two parts:
- Apple vGICv3 support and necessary infrastructure changes for it
- Nested virtualisation support. Note that the nested virtualisation implementation
shipping as of macOS 26.3 is nVHE only (but it _does_ use VNCR as shipped).
It's rebased on top of the WHPX arm64 series and the https://lore.kernel.org/qemu-devel/20260112103034.65310-1-philmd@linaro.org/ series.
Known issues:
- when nested virt is enabled, no UI response within EDK2
and a permanent wait. Workaround: -boot menu=on,splash-time=0. Interrupts do
work later on in Linux.
- This series doesn't contain EL2 physical timer emulation, which is
needed if not leveraging the Apple vGIC.
v1->v2:
Oops. I did a mistake when preparing my patches.
- Add hvf_arm_el2_enable(_) call to virt_set_virt
- Fix nested virt support check to add HVF
v2->v3:
- LORC_EL1 patch was merged separately, remove from this series.
- fix LPIs when kernel-irqchip disabled and using TCG
- remove spurious if case in vGIC supported version detection (inapplicable now)
- Add hvf_enabled() check in combination with hvf kernel-irqchip checks
- cleanly fail on attempt to use the platform vGIC together with ITS
v3->v4:
- GIC state save improvements, including saving the opaque Apple-specific state
- Saving HVF system register state when using the vGIC and/or EL2
v5:
- oops, fixed up save/restore to be functional
- misc changes otherwise
v6:
- Addressing review comments
v7:
- Address review comments, adapt around Qemu changes and bugfixes.
Mohamed Mediouni (10):
hw/intc: Add hvf vGIC interrupt controller support
accel, hw/arm, include/system/hvf: infrastructure changes for HVF vGIC
hvf: save/restore Apple GIC state
hw/arm, target/arm: nested virtualisation on HVF
target/arm: hvf: pass through CNTHCTL_EL2 and MDCCINT_EL1
hvf: only call hvf_sync_vtimer() when running without the platform
vGIC
hvf: gate ARM_FEATURE_PMU register emulation behind not being at EL2
target/arm: hvf: instantiate GIC early
target/arm: hvf: add asserts for code paths not leveraged when using
the vGIC
hvf: sync registers used at EL2
accel/hvf/hvf-all.c | 51 ++
accel/stubs/hvf-stub.c | 2 +
hw/arm/virt.c | 33 +-
hw/intc/arm_gicv3_common.c | 3 +
hw/intc/arm_gicv3_hvf.c | 743 +++++++++++++++++++++++++++++
hw/intc/meson.build | 1 +
include/hw/intc/arm_gicv3_common.h | 1 +
include/system/hvf.h | 8 +
system/vl.c | 2 +
target/arm/hvf/hvf.c | 189 +++++++-
target/arm/hvf/sysreg.c.inc | 35 ++
11 files changed, 1054 insertions(+), 14 deletions(-)
create mode 100644 hw/intc/arm_gicv3_hvf.c
--
2.50.1 (Apple Git-155)