From: Marc Zyngier <marc.zyngier@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>, edk2-devel@lists.01.org
Cc: leif.lindholm@linaro.org, lersek@redhat.com, heyi.guo@linaro.org
Subject: Re: [PATCH] ArmPkg/TimerDxe: remove workaround for KVM timer handling
Date: Thu, 15 Mar 2018 10:40:18 +0000 [thread overview]
Message-ID: <d06a8edc-6481-01ae-c5e6-b80a21f5850d@arm.com> (raw)
In-Reply-To: <20180315102826.10517-1-ard.biesheuvel@linaro.org>
On 15/03/18 10:28, Ard Biesheuvel wrote:
> 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>
> ---
> ArmPkg/Drivers/TimerDxe/TimerDxe.c | 1 -
> ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c | 10 ----------
> 2 files changed, 11 deletions(-)
>
> diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c
> index a3202fa056f3..bd616d2efc73 100644
> --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c
> +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c
> @@ -337,7 +337,6 @@ TimerInterruptHandler (
>
> // Set next compare value
> ArmGenericTimerSetCompareVal (CompareValue);
> - ArmGenericTimerEnableTimer ();
> ArmInstructionSynchronizationBarrier ();
> }
>
> diff --git a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> index 69a4ceb62db6..c941895a3574 100644
> --- a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> +++ b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> @@ -26,16 +26,6 @@ ArmGenericTimerEnableTimer (
>
> TimerCtrlReg = ArmReadCntvCtl ();
> TimerCtrlReg |= ARM_ARCH_TIMER_ENABLE;
> -
> - //
> - // When running under KVM, we need to unmask the interrupt on the timer side
> - // as KVM will mask it when servicing the interrupt at the hypervisor level
> - // and delivering the virtual timer interrupt to the guest. Otherwise, the
> - // interrupt will fire again, trapping into the hypervisor again, etc. etc.
> - // This is scheduled to be fixed on the KVM side, but there is no harm in
> - // leaving this in once KVM gets fixed.
> - //
> - TimerCtrlReg &= ~ARM_ARCH_TIMER_IMASK;
> ArmWriteCntvCtl (TimerCtrlReg);
> }
>
>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2018-03-15 10:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 10:28 [PATCH] ArmPkg/TimerDxe: remove workaround for KVM timer handling Ard Biesheuvel
2018-03-15 10:40 ` Marc Zyngier [this message]
2018-03-15 19:01 ` Leif Lindholm
2018-03-15 19:47 ` Laszlo Ersek
2018-03-16 11:28 ` Ard Biesheuvel
2018-03-16 11:46 ` Leif Lindholm
2018-03-16 13:25 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d06a8edc-6481-01ae-c5e6-b80a21f5850d@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox