Skip to content

Commit affd1c8

Browse files
author
Marc Zyngier
committed
KVM: arm64: nv: Document EL2 timer API
Acked-by: Oliver Upton <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Marc Zyngier <[email protected]>
1 parent 0bc9a9e commit affd1c8

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Documentation/virt/kvm/devices/vcpu.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ the cpu field to the processor id.
142142

143143
:Architectures: ARM64
144144

145-
2.1. ATTRIBUTES: KVM_ARM_VCPU_TIMER_IRQ_VTIMER, KVM_ARM_VCPU_TIMER_IRQ_PTIMER
146-
-----------------------------------------------------------------------------
145+
2.1. ATTRIBUTES: KVM_ARM_VCPU_TIMER_IRQ_VTIMER, KVM_ARM_VCPU_TIMER_IRQ_PTIMER,
146+
KVM_ARM_VCPU_TIMER_IRQ_HVTIMER, KVM_ARM_VCPU_TIMER_IRQ_HPTIMER,
147+
--------------------------------------------------------------------------------
147148

148149
:Parameters: in kvm_device_attr.addr the address for the timer interrupt is a
149150
pointer to an int
@@ -159,10 +160,12 @@ A value describing the architected timer interrupt number when connected to an
159160
in-kernel virtual GIC. These must be a PPI (16 <= intid < 32). Setting the
160161
attribute overrides the default values (see below).
161162

162-
============================= ==========================================
163-
KVM_ARM_VCPU_TIMER_IRQ_VTIMER The EL1 virtual timer intid (default: 27)
164-
KVM_ARM_VCPU_TIMER_IRQ_PTIMER The EL1 physical timer intid (default: 30)
165-
============================= ==========================================
163+
============================== ==========================================
164+
KVM_ARM_VCPU_TIMER_IRQ_VTIMER The EL1 virtual timer intid (default: 27)
165+
KVM_ARM_VCPU_TIMER_IRQ_PTIMER The EL1 physical timer intid (default: 30)
166+
KVM_ARM_VCPU_TIMER_IRQ_HVTIMER The EL2 virtual timer intid (default: 28)
167+
KVM_ARM_VCPU_TIMER_IRQ_HPTIMER The EL2 physical timer intid (default: 26)
168+
============================== ==========================================
166169

167170
Setting the same PPI for different timers will prevent the VCPUs from running.
168171
Setting the interrupt number on a VCPU configures all VCPUs created at that

0 commit comments

Comments
 (0)