linux-kernel - [PATCH] clocksource: arm_arch_timer: discard unavailable timers correctly

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1410911445-19067-1-git-send-email-sudeep.holla@arm.com>
Date:	Wed, 17 Sep 2014 00:50:45 +0100
From:	Sudeep Holla <sudeep.holla@....com>
To:	linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Cc:	Daniel Lezcano <daniel.lezcano@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Sudeep Holla <sudeep.holla@....com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Mark Rutland <mark.rutland@....com>
Subject: [PATCH] clocksource: arm_arch_timer: discard unavailable timers correctly

Currently we wait until both nodes are probed if we have two timers
without checking if the device is actually available. This might
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@...eaurora.org>
Cc: Mark Rutland <mark.rutland@....com>
Signed-off-by: Sudeep Holla <sudeep.holla@....com>
---
 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;
 	}
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/