When we first ported EDK2 to KVM/arm, we implemented a workaround for
the quirky timer handling on the KVM side. This has been fixed in
Linux commit
f120cd6533d2 ("KVM: arm/arm64: timer: Allow the timer to
control the active state") dated 23 June 2014, which was incorporated
into Linux release 4.3.
So almost 4 years later, it should be safe to drop this workaround on
the EDK2 side.
This reverts commit
b1a633434ddc.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
\r
// Set next compare value\r
ArmGenericTimerSetCompareVal (CompareValue);\r
- ArmGenericTimerEnableTimer ();\r
ArmInstructionSynchronizationBarrier ();\r
}\r
\r
\r
TimerCtrlReg = ArmReadCntvCtl ();\r
TimerCtrlReg |= ARM_ARCH_TIMER_ENABLE;\r
-\r
- //\r
- // When running under KVM, we need to unmask the interrupt on the timer side\r
- // as KVM will mask it when servicing the interrupt at the hypervisor level\r
- // and delivering the virtual timer interrupt to the guest. Otherwise, the\r
- // interrupt will fire again, trapping into the hypervisor again, etc. etc.\r
- // This is scheduled to be fixed on the KVM side, but there is no harm in\r
- // leaving this in once KVM gets fixed.\r
- //\r
- TimerCtrlReg &= ~ARM_ARCH_TIMER_IMASK;\r
ArmWriteCntvCtl (TimerCtrlReg);\r
}\r
\r