From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Noam Camus <noamca@mellanox.com>, <tglx@linutronix.de>,
<linux-snps-arc@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <Alexey.Brodkin@synopsys.com>,
Vineet Gupta <Vineet.Gupta1@synopsys.com>
Subject: [PATCH v4 2/8] ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
Date: Fri, 11 Nov 2016 13:38:46 -0800 [thread overview]
Message-ID: <1478900332-24279-3-git-send-email-vgupta@synopsys.com> (raw)
In-Reply-To: <1478900332-24279-1-git-send-email-vgupta@synopsys.com>
... don't rely on cpuinfo populated in arc boot code. This paves way for
moving this code in drivers/clocksource/
And while at it, convert the WARN() to pr_warn() as sugested by Daniel
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---
arch/arc/kernel/time.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 8d66bb446209..d3f3750a0d2d 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -111,11 +111,14 @@ static struct clocksource arc_counter_gfrc = {
static int __init arc_cs_setup_gfrc(struct device_node *node)
{
- int exists = cpuinfo_arc700[0].extn.gfrc;
+ struct mcip_bcr mp;
int ret;
- if (WARN(!exists, "Global-64-bit-Ctr clocksource not detected"))
+ READ_BCR(ARC_REG_MCIP_BCR, mp);
+ if (!mp.gfrc) {
+ pr_warn("Global-64-bit-Ctr clocksource not detected");
return -ENXIO;
+ }
ret = arc_get_timer_clk(node);
if (ret)
@@ -163,15 +166,20 @@ static struct clocksource arc_counter_rtc = {
static int __init arc_cs_setup_rtc(struct device_node *node)
{
- int exists = cpuinfo_arc700[smp_processor_id()].extn.rtc;
+ struct bcr_timer timer;
int ret;
- if (WARN(!exists, "Local-64-bit-Ctr clocksource not detected"))
+ READ_BCR(ARC_REG_TIMERS_BCR, timer);
+ if (!timer.rtc) {
+ pr_warn("Local-64-bit-Ctr clocksource not detected");
return -ENXIO;
+ }
/* Local to CPU hence not usable in SMP */
- if (WARN(IS_ENABLED(CONFIG_SMP), "Local-64-bit-Ctr not usable in SMP"))
+ if (IS_ENABLED(CONFIG_SMP)) {
+ pr_warn("Local-64-bit-Ctr not usable in SMP");
return -EINVAL;
+ }
ret = arc_get_timer_clk(node);
if (ret)
--
2.7.4
next prev parent reply other threads:[~2016-11-11 21:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 21:38 [PATCH v4 0/8] Move ARC timer code into drivers/clocksource/ Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 1/8] ARC: timer: gfrc, rtc: deuglify big endian code Vineet Gupta
2016-11-11 21:38 ` Vineet Gupta [this message]
2016-11-11 21:38 ` [PATCH v4 3/8] ARC: time: move time_init() out of the driver Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 4/8] ARC: timer: Build gfrc, rtc under same option (64-bit timers) Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 5/8] ARC: breakout aux handling into a separate header Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 6/8] ARC: move mcip.h into include/soc and adjust the includes Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 7/8] ARC: breakout timer include code into separate header Vineet Gupta
2016-11-11 21:38 ` [PATCH v4 8/8] clocksource: import ARC timer driver Vineet Gupta
2016-11-11 23:11 ` Daniel Lezcano
2016-11-12 0:53 ` Vineet Gupta
[not found] ` <CAKnoXLzY7Qxw39R029cprqzy4WvKXYf5PReutORO+JyMvaxeqA@mail.gmail.com>
2016-11-15 10:30 ` Daniel Lezcano
2016-11-15 17:16 ` Vineet Gupta
2016-11-15 17:23 ` Daniel Lezcano
2016-11-15 17:27 ` Vineet Gupta
[not found] ` <DB6PR0501MB2518CBABEBEB7499F0D023A0AABF0@DB6PR0501MB2518.eurprd05.prod.outlook.com>
2016-11-15 17:49 ` Daniel Lezcano
[not found] ` <DB6PR0501MB25183F3E7B3B5D224F646F79AABF0@DB6PR0501MB2518.eurprd05.prod.outlook.com>
2016-11-15 19:29 ` 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=1478900332-24279-3-git-send-email-vgupta@synopsys.com \
--to=vineet.gupta1@synopsys.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=noamca@mellanox.com \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).