All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kochetkov <al.kochet@gmail.com>
To: daniel.lezcano@linaro.org, tglx@linutronix.de, heiko@sntech.de,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Cc: Alexander Kochetkov <al.kochet@gmail.com>
Subject: [PATCH 6/9] clocksource/drivers/rockchip_timer: implement reading 64bit value from timer
Date: Wed, 23 Nov 2016 20:29:34 +0300	[thread overview]
Message-ID: <1479922177-20136-6-git-send-email-al.kochet@gmail.com> (raw)
In-Reply-To: <1479922177-20136-1-git-send-email-al.kochet@gmail.com>

Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
---
 drivers/clocksource/rockchip_timer.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index f4c26be..61787c5 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -19,6 +19,8 @@
 
 #define TIMER_LOAD_COUNT0	0x00
 #define TIMER_LOAD_COUNT1	0x04
+#define TIMER_CURRENT_VALUE0	0x08
+#define TIMER_CURRENT_VALUE1	0x0C
 #define TIMER_CONTROL_REG3288	0x10
 #define TIMER_CONTROL_REG3399	0x1c
 #define TIMER_INT_STATUS	0x18
@@ -72,6 +74,25 @@ static void rk_timer_update_counter(u64 cycles, struct rk_timer *timer)
 	writel_relaxed(upper, timer->base + TIMER_LOAD_COUNT1);
 }
 
+static u64 rk_timer_counter_read(struct rk_timer *timer)
+{
+	u64 counter;
+	u32 lower;
+	u32 upper, old_upper;
+
+	upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1);
+	do {
+		old_upper = upper;
+		lower = readl_relaxed(timer->base + TIMER_CURRENT_VALUE0);
+		upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1);
+	} while (upper != old_upper);
+
+	counter = upper;
+	counter <<= 32;
+	counter |= lower;
+	return counter;
+}
+
 static void rk_timer_interrupt_clear(struct rk_timer *timer)
 {
 	writel_relaxed(1, timer->base + TIMER_INT_STATUS);
-- 
1.7.9.5

WARNING: multiple messages have this Message-ID (diff)
From: al.kochet@gmail.com (Alexander Kochetkov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] clocksource/drivers/rockchip_timer: implement reading 64bit value from timer
Date: Wed, 23 Nov 2016 20:29:34 +0300	[thread overview]
Message-ID: <1479922177-20136-6-git-send-email-al.kochet@gmail.com> (raw)
In-Reply-To: <1479922177-20136-1-git-send-email-al.kochet@gmail.com>

Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
---
 drivers/clocksource/rockchip_timer.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index f4c26be..61787c5 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -19,6 +19,8 @@
 
 #define TIMER_LOAD_COUNT0	0x00
 #define TIMER_LOAD_COUNT1	0x04
+#define TIMER_CURRENT_VALUE0	0x08
+#define TIMER_CURRENT_VALUE1	0x0C
 #define TIMER_CONTROL_REG3288	0x10
 #define TIMER_CONTROL_REG3399	0x1c
 #define TIMER_INT_STATUS	0x18
@@ -72,6 +74,25 @@ static void rk_timer_update_counter(u64 cycles, struct rk_timer *timer)
 	writel_relaxed(upper, timer->base + TIMER_LOAD_COUNT1);
 }
 
+static u64 rk_timer_counter_read(struct rk_timer *timer)
+{
+	u64 counter;
+	u32 lower;
+	u32 upper, old_upper;
+
+	upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1);
+	do {
+		old_upper = upper;
+		lower = readl_relaxed(timer->base + TIMER_CURRENT_VALUE0);
+		upper = readl_relaxed(timer->base + TIMER_CURRENT_VALUE1);
+	} while (upper != old_upper);
+
+	counter = upper;
+	counter <<= 32;
+	counter |= lower;
+	return counter;
+}
+
 static void rk_timer_interrupt_clear(struct rk_timer *timer)
 {
 	writel_relaxed(1, timer->base + TIMER_INT_STATUS);
-- 
1.7.9.5

  parent reply	other threads:[~2016-11-23 17:30 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-23 17:29 [PATCH 1/9] clocksource/drivers/rockchip_timer: split bc_timer into rk_timer and rk_clock_event_device Alexander Kochetkov
2016-11-23 17:29 ` Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 2/9] clocksource/drivers/rockchip_timer: low level routines take rk_timer as parameter Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 3/9] clocksource/drivers/rockchip_timer: drop unused rk_base() and rk_ctrl() Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 4/9] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable() Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 5/9] clocksource/drivers/rockchip_timer: implement loading 64bit value into timer Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-23 17:29 ` Alexander Kochetkov [this message]
2016-11-23 17:29   ` [PATCH 6/9] clocksource/drivers/rockchip_timer: implement reading 64bit value from timer Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 7/9] clocksource/drivers/rockchip_timer: implement clocksource timer Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-24  9:36   ` Alexander Kochetkov
2016-11-24  9:36     ` Alexander Kochetkov
2016-11-24  9:36     ` Alexander Kochetkov
2016-11-24 12:17     ` Heiko Stübner
2016-11-24 12:17       ` Heiko Stübner
2016-11-24 12:17       ` Heiko Stübner
2016-11-24 13:05       ` Alexander Kochetkov
2016-11-24 13:05         ` Alexander Kochetkov
2016-11-24 13:21         ` Heiko Stübner
2016-11-24 13:21           ` Heiko Stübner
2016-11-24 14:14           ` Alexander Kochetkov
2016-11-24 14:14             ` Alexander Kochetkov
2016-11-24 14:32             ` Heiko Stübner
2016-11-24 14:32               ` Heiko Stübner
2016-11-25  9:17       ` Alexander Kochetkov
2016-11-25  9:17         ` Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 8/9] dt-bindings: add rockchip,clocksource property to rk-timer Alexander Kochetkov
2016-11-23 17:29   ` [PATCH 8/9] dt-bindings: add rockchip, clocksource " Alexander Kochetkov
2016-11-23 17:29 ` [PATCH 9/9] ARM: dts: rockchip: add timer entries to rk3188.dtsi Alexander Kochetkov
2016-11-23 17:29   ` Alexander Kochetkov
2016-11-24 12:01 ` [PATCH 1/9] clocksource/drivers/rockchip_timer: split bc_timer into rk_timer and rk_clock_event_device Heiko Stübner
2016-11-24 12:01   ` Heiko Stübner
2016-11-24 12:12   ` Alexander Kochetkov
2016-11-24 12:12     ` Alexander Kochetkov

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=1479922177-20136-6-git-send-email-al.kochet@gmail.com \
    --to=al.kochet@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.