From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: edk2-devel@lists.01.org, ryan.harkin@linaro.org,
leif.lindholm@linaro.org, marc.zyngier@arm.com
Subject: Re: [PATCH] ArmPkg/ArmGenericTimerVirtCounterLib: deal with broken generic timers
Date: Fri, 20 Jan 2017 14:41:45 +0000 [thread overview]
Message-ID: <20170120144145.GB22152@leverpostej> (raw)
In-Reply-To: <1484922043-21762-1-git-send-email-ard.biesheuvel@linaro.org>
[Adding Marc Zyngier]
On Fri, Jan 20, 2017 at 02:20:43PM +0000, Ard Biesheuvel wrote:
> Users of ArmGenericTimerVirtCounterLib may execute under virtualization,
> which implies that they may be affected by core errata of the host.
>
> Some implementations of the ARM Generic Timer are affected by errata where
> reads of the counter and reads or writes to the timer value may execute
> incorrectly when issued around the time the counter is incremented by
> the hardware.
So far, there are at least two slightly different errata I've seen in
this area: Freescale erratum A-008585, and Hisilicon erratum #161010101.
The first has a workaround in upstream Linux, whereas the latter
apparently requires a different workaround, and is currently under
review.
There may not be a one-size-fits-all solution, here. To that end, I
would strongly suggest that we document precisely which errata we are
trying to handle here.
> Since we can easily work around this without affecting performance too
> much, implement an unconditional workaround that compares two subsequent
> reads of the counter to ensure the value is correct. Note that the number
> for attempts should be limited to avoid breaking platforms such as QEMU
> with TCG emulation, since that has been observed never to return the same
> value from back to back reads of the counter register.
Even on real HW it's possible for back-to-back counter reads to not
(ever) see the same value. That may depend on the relative frequency of
the CPU and counter clocks, e.g. consider FPGAs, or the read of the
counter might always take at least one counter cycle.
Thanks,
Mark.
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>
> Note that this patch applies on top of the patch 'ArmPkg/ArmLib: remove
> indirection layer from timer register accessors' that I send out earlier
> today.
>
> ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c | 51 ++++++++++++++++++--
> 1 file changed, 48 insertions(+), 3 deletions(-)
>
> diff --git a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> index 69a4ceb62db6..9fe673e8222c 100644
> --- a/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> +++ b/ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.c
> @@ -70,13 +70,36 @@ ArmGenericTimerGetTimerFreq (
> return ArmReadCntFrq ();
> }
>
> +//
> +// The virtual counter may be used under virtualization on a host that
> +// is affected by one of the various errata where reads to the counter
> +// register may return incorrect values when the access occurs at the exact
> +// time that the counter is incremented by the hardware. This affects the
> +// timer as well as the counter.
> +// So repeat the read until we get the same value twice. Unfortunately,
> +// platforms such as QEMU with TCG emulation (i.e., non-virtualized) appear
> +// never to return the same value twice, so we need to set a retry limit.
> +//
> +#define MAX_RETRIES 200
> +
> UINTN
> EFIAPI
> ArmGenericTimerGetTimerVal (
> VOID
> )
> {
> - return ArmReadCntvTval ();
> + UINTN Result;
> + UINTN Tries;
> +
> + Tries = 0;
> + do {
> + //
> + // Keep reading until we see the same value twice in a row. See above.
> + //
> + Result = ArmReadCntvTval ();
> + } while (Result != ArmReadCntvTval () && ++Tries < MAX_RETRIES);
> +
> + return Result;
> }
>
>
> @@ -86,7 +109,18 @@ ArmGenericTimerSetTimerVal (
> IN UINTN Value
> )
> {
> - ArmWriteCntvTval (Value);
> + UINTN CounterVal;
> + UINTN Tries;
> +
> + Tries = 0;
> + do {
> + //
> + // Read the counter before and after the write to TVAL, to ensure that
> + // the write to TVAL did not involve a corrupted sample of the counter.
> + //
> + CounterVal = ArmReadCntvCt ();
> + ArmWriteCntvTval (Value);
> + } while (CounterVal != ArmReadCntvCt () && ++Tries < MAX_RETRIES);
> }
>
> UINT64
> @@ -95,7 +129,18 @@ ArmGenericTimerGetSystemCount (
> VOID
> )
> {
> - return ArmReadCntvCt ();
> + UINT64 Result;
> + UINTN Tries;
> +
> + Tries = 0;
> + do {
> + //
> + // Keep reading until we see the same value twice in a row. See above.
> + //
> + Result = ArmReadCntvCt ();
> + } while (Result != ArmReadCntvCt () && ++Tries < MAX_RETRIES);
> +
> + return Result;
> }
>
> UINTN
> --
> 2.7.4
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
next prev parent reply other threads:[~2017-01-20 14:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 14:20 [PATCH] ArmPkg/ArmGenericTimerVirtCounterLib: deal with broken generic timers Ard Biesheuvel
2017-01-20 14:22 ` Ard Biesheuvel
2017-01-20 14:41 ` Mark Rutland [this message]
[not found] ` <22373f4c-043b-3ee4-1c60-ecf2c7fa6845@arm.com>
2017-01-20 15:20 ` 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=20170120144145.GB22152@leverpostej \
--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