[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 00/23] arm: Add virtualization to GICv3, and enable EL
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 00/23] arm: Add virtualization to GICv3, and enable EL2 on 64-bit CPUs |
Date: |
Tue, 13 Dec 2016 10:36:01 +0000 |
This patchset adds support for the Virtualization extensions to QEMU's
GICv3 emulation. This was the last missing piece that was stopping
us from turning on the EL2 support in the CPU model, so the patchset
also adds support for enabling it all on the virt board via the
'-machine virtualization=on' option.
The result works well enough to allow booting a KVM outer guest kernel
and then running QEMU + an inner guest under KVM inside it. The outer
guest KVM also passes the kvm-unit-tests GIC tests.
Patches 1-7 have already appeared on list, and 1-5 + 7 have been
reviewed. The rest are new.
As per mailing list discussion, there is a new CPU property
for enabling EL2 which defaults to 'true' (named 'has_el2' to
parallel the existing 'has_el3'). There is also a board property
on 'virt' which defaults to 'false' (named 'virtualization' to
parallel the existing 'secure'). The only other 64-bit board
is the ZynqMP -- this patchset makes it always set has_el2 to false,
so no change in behaviour. (I imagine the Xilinx folk will want to
enable it at some point.)
There is no property on the GIC device object to enable virtualization,
because this only affects the CPU interface, which in real hardware
is part of the CPU itself and which in QEMU we enable and configure
via a close coupling between the cpuif code and the CPU code.
These patches include changes to the reported device tree info
to (a) report the GICv3 maintenance IRQ binding and (b) report
use of SMC as the PSCI conduit. I haven't tried to make the
equivalent changes to the ACPI tables because Drew said on
Monday that he had a cleanup to make in that area, which would
change all that code anyway. I'm guessing there'll be a v2 of
this series, so we can fix that dependency up properly then.
The new state in the GICv3 for the virtualization should not
cause a migration compat break because we put it in a subsection
which is only sent if virtualization is enabled.
Unfortunately to enable EL2 on the 32-bit CPU models we need
to do this all over again for the GICv2 emulation :-)
Git branch for this:
https://git.linaro.org/people/peter.maydell/qemu-arm.git gicv3-virt
thanks
-- PMM
Peter Maydell (23):
target-arm: Log AArch64 exception returns
hw/intc/arm_gicv3: Remove incorrect usage of fieldoffset
hw/intc/arm_gicv3: Don't signal Pending+Active interrupts to CPU
hw/arm/virt: add 2.9 machine type
hw/arm/virt: Merge VirtBoardInfo and VirtMachineState
hw/arm/virt: Rename 'vbi' variables to 'vms'
hw/arm/virt: Don't incorrectly claim architectural timer to be
edge-triggered
hw/intc/arm_gicv3: Add external IRQ lines for VIRQ and VFIQ
hw/intc/arm_gic: Add external IRQ lines for VIRQ and VFIQ
target-arm: Expose output GPIO line for VCPU maintenance interrupt
hw/arm/virt: Wire VIRQ, VFIQ, maintenance irq lines from GIC to CPU
target-arm: Add ARMCPU fields for GIC CPU i/f config
hw/intc/gicv3: Add defines for ICH system register fields
hw/intc/gicv3: Add data fields for virtualization support
hw/intc/arm_gicv3: Add accessors for ICH_ system registers
hw/intc/arm_gicv3: Implement ICV_ registers which are just accessors
hw/intc/arm_gicv3: Implement ICV_ HPPIR, DIR and RPR registers
hw/intc/arm_gicv3: Implement ICV_ registers EOIR and IAR
hw/intc/arm_gicv3: Implement gicv3_cpuif_virt_update()
hw/intc/arm_gicv3: Implement EL2 traps for CPU i/f regs
hw/arm/virt: Support using SMC for PSCI
target-arm: Enable EL2 feature bit on A53 and A57
hw/arm/virt: Add board property to enable EL2
hw/intc/gicv3_internal.h | 79 +++
include/hw/arm/virt.h | 2 +
include/hw/compat.h | 3 +
include/hw/intc/arm_gic_common.h | 2 +
include/hw/intc/arm_gicv3_common.h | 21 +
target-arm/cpu.h | 9 +
hw/arm/virt.c | 696 +++++++++++--------
hw/arm/xlnx-zynqmp.c | 2 +
hw/intc/arm_gic_common.c | 6 +
hw/intc/arm_gicv3.c | 5 +
hw/intc/arm_gicv3_common.c | 31 +
hw/intc/arm_gicv3_cpuif.c | 1336 +++++++++++++++++++++++++++++++++++-
target-arm/cpu.c | 15 +
target-arm/cpu64.c | 8 +
target-arm/op_helper.c | 9 +
hw/intc/trace-events | 33 +
16 files changed, 1925 insertions(+), 332 deletions(-)
--
2.7.4
- [Qemu-arm] [PATCH 00/23] arm: Add virtualization to GICv3, and enable EL2 on 64-bit CPUs,
Peter Maydell <=
- [Qemu-arm] [PATCH 17/23] hw/intc/arm_gicv3: Implement ICV_ HPPIR, DIR and RPR registers, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 14/23] hw/intc/gicv3: Add data fields for virtualization support, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 19/23] hw/intc/arm_gicv3: Implement gicv3_cpuif_virt_update(), Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 16/23] hw/intc/arm_gicv3: Implement ICV_ registers which are just accessors, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 21/23] hw/arm/virt: Support using SMC for PSCI, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 13/23] hw/intc/gicv3: Add defines for ICH system register fields, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 15/23] hw/intc/arm_gicv3: Add accessors for ICH_ system registers, Peter Maydell, 2016/12/13
- [Qemu-arm] [PATCH 08/23] hw/intc/arm_gicv3: Add external IRQ lines for VIRQ and VFIQ, Peter Maydell, 2016/12/13