From: mark.rutland@arm•com (Mark Rutland)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM/ARM64: arch-timer: fix arch_timer_probed logic
Date: Wed, 15 Oct 2014 16:28:23 +0100 [thread overview]
Message-ID: <20141015152823.GH20034@leverpostej> (raw)
In-Reply-To: <1413385580-23317-1-git-send-email-marc.zyngier@arm.com>
On Wed, Oct 15, 2014 at 04:06:20PM +0100, Marc Zyngier wrote:
> Commit c387f07e6205 (clocksource: arm_arch_timer: Discard unavailable
> timers correctly) changed the way the driver makes sure both the memory
> and system-register timers have been probed before finalizing the probing.
>
> There is a interesting flaw in this logic that leads to this final step
> never to be executed. Things seems to work pretty well until something
> actually needs the data that is produced during this final stage.
>
> For example, KVM explodes on the first run of a guest when executed on
> a platform that has both memory and sysreg nodes (Juno, for example).
As far as I can tell, the logic is flawed for all cases except two
functional nodes that we manage to probe.
>
> Just fix the damned logic, and enjoy booting VMs again.
>
> Tested on a Juno system.
>
> Cc: Sudeep Holla <sudeep.holla@arm•com>
> Cc: Stephen Boyd <sboyd@codeaurora•org>
> Cc: Mark Rutland <mark.rutland@arm•com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro•org>
> Cc: Christoffer Dall <christoffer.dall@linaro•org>
> Reported-by: Riku Voipio <riku.voipio@linaro•org>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm•com>
The new logic makes sense to me, so:
Acked-by: Mark Rutland <mark.rutland@arm•com>
Thanks,
Mark.
> ---
> drivers/clocksource/arm_arch_timer.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
> index 2133f9d..43005d4 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -660,11 +660,11 @@ static bool __init
> arch_timer_probed(int type, const struct of_device_id *matches)
> {
> struct device_node *dn;
> - bool probed = false;
> + bool probed = true;
>
> dn = of_find_matching_node(NULL, matches);
> - if (dn && of_device_is_available(dn) && (arch_timers_present & type))
> - probed = true;
> + if (dn && of_device_is_available(dn) && !(arch_timers_present & type))
> + probed = false;
> of_node_put(dn);
>
> return probed;
> --
> 2.0.4
>
>
next prev parent reply other threads:[~2014-10-15 15:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-15 15:06 [PATCH] ARM/ARM64: arch-timer: fix arch_timer_probed logic Marc Zyngier
2014-10-15 15:28 ` Mark Rutland [this message]
2014-10-15 15:49 ` Sudeep Holla
2014-10-21 10:58 ` Daniel Lezcano
2014-10-21 11:07 ` Mark Rutland
2014-10-21 11:12 ` Daniel Lezcano
2014-10-27 10:33 ` Marc Zyngier
2014-10-27 20:30 ` Thomas Gleixner
2014-10-27 21:52 ` Daniel Lezcano
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-all 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=20141015152823.GH20034@leverpostej \
--to=mark.rutland@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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