All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kochetkov <al.kochet@gmail.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
	Heiko Stuebner <heiko@sntech.de>,
	linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Mark Rutland <mark.rutland@arm.com>,
	Rob Herring <robh+dt@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Caesar Wang <wxt@rock-chips.com>,
	Huang Tao <huangtao@rock-chips.com>,
	Alexander Kochetkov <al.kochet@gmail.com>
Subject: [PATCH v5 7/8] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable()
Date: Tue, 24 Jan 2017 15:16:42 +0300	[thread overview]
Message-ID: <1485260203-14216-8-git-send-email-al.kochet@gmail.com> (raw)
In-Reply-To: <1485260203-14216-1-git-send-email-al.kochet@gmail.com>

This allow to enable timer without enabling interrupts from it.
As that mode will be used in clocksource implementation.

This is refactoring step without functional changes.

Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
Reviwed-by: Heiko Stübner <heiko@sntech.de>
---
 drivers/clocksource/rockchip_timer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index a17dc61..61c3bb1 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -60,8 +60,7 @@ static inline void rk_timer_disable(struct rk_timer *timer)
 
 static inline void rk_timer_enable(struct rk_timer *timer, u32 flags)
 {
-	writel_relaxed(TIMER_ENABLE | TIMER_INT_UNMASK | flags,
-		       timer->ctrl);
+	writel_relaxed(TIMER_ENABLE | flags, timer->ctrl);
 }
 
 static void rk_timer_update_counter(unsigned long cycles,
@@ -83,7 +82,8 @@ static inline int rk_timer_set_next_event(unsigned long cycles,
 
 	rk_timer_disable(timer);
 	rk_timer_update_counter(cycles, timer);
-	rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT);
+	rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT |
+			       TIMER_INT_UNMASK);
 	return 0;
 }
 
@@ -101,7 +101,7 @@ static int rk_timer_set_periodic(struct clock_event_device *ce)
 
 	rk_timer_disable(timer);
 	rk_timer_update_counter(timer->freq / HZ - 1, timer);
-	rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING);
+	rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING | TIMER_INT_UNMASK);
 	return 0;
 }
 
-- 
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 v5 7/8] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable()
Date: Tue, 24 Jan 2017 15:16:42 +0300	[thread overview]
Message-ID: <1485260203-14216-8-git-send-email-al.kochet@gmail.com> (raw)
In-Reply-To: <1485260203-14216-1-git-send-email-al.kochet@gmail.com>

This allow to enable timer without enabling interrupts from it.
As that mode will be used in clocksource implementation.

This is refactoring step without functional changes.

Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
Reviwed-by: Heiko St?bner <heiko@sntech.de>
---
 drivers/clocksource/rockchip_timer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
index a17dc61..61c3bb1 100644
--- a/drivers/clocksource/rockchip_timer.c
+++ b/drivers/clocksource/rockchip_timer.c
@@ -60,8 +60,7 @@ static inline void rk_timer_disable(struct rk_timer *timer)
 
 static inline void rk_timer_enable(struct rk_timer *timer, u32 flags)
 {
-	writel_relaxed(TIMER_ENABLE | TIMER_INT_UNMASK | flags,
-		       timer->ctrl);
+	writel_relaxed(TIMER_ENABLE | flags, timer->ctrl);
 }
 
 static void rk_timer_update_counter(unsigned long cycles,
@@ -83,7 +82,8 @@ static inline int rk_timer_set_next_event(unsigned long cycles,
 
 	rk_timer_disable(timer);
 	rk_timer_update_counter(cycles, timer);
-	rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT);
+	rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT |
+			       TIMER_INT_UNMASK);
 	return 0;
 }
 
@@ -101,7 +101,7 @@ static int rk_timer_set_periodic(struct clock_event_device *ce)
 
 	rk_timer_disable(timer);
 	rk_timer_update_counter(timer->freq / HZ - 1, timer);
-	rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING);
+	rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING | TIMER_INT_UNMASK);
 	return 0;
 }
 
-- 
1.7.9.5

  parent reply	other threads:[~2017-01-24 12:17 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-24 12:16 [PATCH v5 0/8] Implement clocksource for rockchip SoC using rockchip timer Alexander Kochetkov
2017-01-24 12:16 ` Alexander Kochetkov
2017-01-24 12:16 ` Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 1/8] dt-bindings: clarify compatible property for rockchip timers Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 2/8] ARM: dts: rockchip: update compatible property for rk322x timer Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 3/8] ARM: dts: rockchip: add timer entries to rk3188 SoC Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-30 11:04   ` Daniel Lezcano
2017-01-30 11:04     ` Daniel Lezcano
2017-01-30 11:04     ` Daniel Lezcano
2017-01-30 11:20     ` Alexander Kochetkov
2017-01-30 11:20       ` Alexander Kochetkov
2017-01-30 12:04       ` Daniel Lezcano
2017-01-30 12:04         ` Daniel Lezcano
2017-01-30 13:13         ` Alexander Kochetkov
2017-01-30 13:13           ` Alexander Kochetkov
2017-01-30 13:13           ` Alexander Kochetkov
2017-01-30 13:35           ` Daniel Lezcano
2017-01-30 13:35             ` Daniel Lezcano
2017-01-30 13:35             ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 4/8] ARM: dts: rockchip: disable arm-global-timer for rk3188 Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-30 10:21   ` Daniel Lezcano
2017-01-30 10:21     ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 5/8] clocksource/drivers/rockchip_timer: split bc_timer into rk_timer and rk_clock_event_device Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 15:02   ` Heiko Stübner
2017-01-24 15:02     ` Heiko Stübner
2017-01-24 15:02     ` Heiko Stübner
2017-01-24 15:16     ` Alexander Kochetkov
2017-01-24 15:16       ` Alexander Kochetkov
2017-01-24 15:16       ` Alexander Kochetkov
2017-01-29 20:30       ` Heiko Stuebner
2017-01-29 20:30         ` Heiko Stuebner
2017-01-29 20:30         ` Heiko Stuebner
2017-01-30 13:12   ` Daniel Lezcano
2017-01-30 13:12     ` Daniel Lezcano
2017-01-30 13:12     ` Daniel Lezcano
2017-01-30 13:55     ` Alexander Kochetkov
2017-01-30 13:55       ` Alexander Kochetkov
2017-01-30 13:55       ` Alexander Kochetkov
2017-01-30 14:20       ` Daniel Lezcano
2017-01-30 14:20         ` Daniel Lezcano
2017-01-30 14:20         ` Daniel Lezcano
2017-01-24 12:16 ` [PATCH v5 6/8] clocksource/drivers/rockchip_timer: low level routines take rk_timer as parameter Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16 ` Alexander Kochetkov [this message]
2017-01-24 12:16   ` [PATCH v5 7/8] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable() Alexander Kochetkov
2017-01-24 12:16 ` [PATCH v5 8/8] clocksource/drivers/rockchip_timer: implement clocksource timer Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-24 12:16   ` Alexander Kochetkov
2017-01-30 13:54   ` Daniel Lezcano
2017-01-30 13:54     ` Daniel Lezcano
2017-01-30 13:54     ` 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=1485260203-14216-8-git-send-email-al.kochet@gmail.com \
    --to=al.kochet@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=huangtao@rock-chips.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wxt@rock-chips.com \
    /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.