lkml.org 
[lkml]   [2014]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] clocksource: arm_arch_timer: discard unavailable timers correctly
On 09/17, Sudeep Holla wrote:
> Currently we wait until both nodes are probed if we have two timers
> without checking if the device is actually available. This might

device node is actually available?

> result in non-functional system as no timer gets registered.
>
> This patch adds the check for the availablity of the timer device
> so that unavailable timers are discarded correctly.
>
> Cc: Stephen Boyd <sboyd@codeaurora.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---

Looks mostly ok. Comment below could be a follow up I guess.

> drivers/clocksource/arm_arch_timer.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
> index 5163ec1..4d025ad 100644
> --- a/drivers/clocksource/arm_arch_timer.c
> +++ b/drivers/clocksource/arm_arch_timer.c
> @@ -622,11 +622,15 @@ static void __init arch_timer_common_init(void)
>
> /* Wait until both nodes are probed if we have two timers */
> if ((arch_timers_present & mask) != mask) {
> - if (of_find_matching_node(NULL, arch_timer_mem_of_match) &&
> - !(arch_timers_present & ARCH_MEM_TIMER))
> + struct device_node *dn;
> +
> + dn = of_find_matching_node(NULL, arch_timer_mem_of_match);
> + if (dn && of_device_is_available(dn) &&
> + !(arch_timers_present & ARCH_MEM_TIMER))
> return;
> - if (of_find_matching_node(NULL, arch_timer_of_match) &&
> - !(arch_timers_present & ARCH_CP15_TIMER))
> + dn = of_find_matching_node(NULL, arch_timer_of_match);
> + if (dn && of_device_is_available(dn) &&
> + !(arch_timers_present & ARCH_CP15_TIMER))
> return;

Where's the of_node_put()?

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation


\
 
 \ /
  Last update: 2014-09-17 02:21    [W:0.182 / U:0.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site