ArmPkg/TimerDxe: remove workaround for KVM timer handling

[mirror_edk2.git] / ArmPkg / Library / ArmGenericTimerVirtCounterLib / ArmGenericTimerVirtCounterLib.c

diff --git a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
index 69a4ceb62db616dfeaec9e54fe57679811778e11..c941895a3574b0246a8718e3ee3ef02db664deda 100644 (file)
--- a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
+++ b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
@@ -26,16 +26,6 @@ ArmGenericTimerEnableTimer (
 \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