From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, mingo@kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 13/13] clocksource: arm_arch_timer: Consolidate arch_timer_evtstrm_enable
Date: Mon, 29 Sep 2014 02:23:46 +0200 [thread overview]
Message-ID: <1411950226-21598-13-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1411950226-21598-1-git-send-email-daniel.lezcano@linaro.org>
From: Nathan Lynch <nathan_lynch@mentor.com>
The arch_timer_evtstrm_enable hooks in arm and arm64 are substantially
similar, the only difference being a CONFIG_COMPAT-conditional section
which is relevant only for arm64. Copy the arm64 version to the
driver, removing the arch-specific hooks.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/include/asm/arch_timer.h | 11 -----------
arch/arm64/include/asm/arch_timer.h | 14 --------------
drivers/clocksource/arm_arch_timer.c | 15 +++++++++++++++
3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index b7ae444..92793ba 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -99,17 +99,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl));
}
-static inline void arch_timer_evtstrm_enable(int divider)
-{
- u32 cntkctl = arch_timer_get_cntkctl();
- cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
- /* Set the divider and enable virtual event stream */
- cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
- | ARCH_TIMER_VIRT_EVT_EN;
- arch_timer_set_cntkctl(cntkctl);
- elf_hwcap |= HWCAP_EVTSTRM;
-}
-
#endif
#endif
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 49e94c6..f190971 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -104,20 +104,6 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl));
}
-static inline void arch_timer_evtstrm_enable(int divider)
-{
- u32 cntkctl = arch_timer_get_cntkctl();
- cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
- /* Set the divider and enable virtual event stream */
- cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
- | ARCH_TIMER_VIRT_EVT_EN;
- arch_timer_set_cntkctl(cntkctl);
- elf_hwcap |= HWCAP_EVTSTRM;
-#ifdef CONFIG_COMPAT
- compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
-#endif
-}
-
static inline u64 arch_counter_get_cntvct(void)
{
u64 cval;
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 42bd445..2133f9d 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -299,6 +299,21 @@ static void __arch_timer_setup(unsigned type,
clockevents_config_and_register(clk, arch_timer_rate, 0xf, 0x7fffffff);
}
+static void arch_timer_evtstrm_enable(int divider)
+{
+ u32 cntkctl = arch_timer_get_cntkctl();
+
+ cntkctl &= ~ARCH_TIMER_EVT_TRIGGER_MASK;
+ /* Set the divider and enable virtual event stream */
+ cntkctl |= (divider << ARCH_TIMER_EVT_TRIGGER_SHIFT)
+ | ARCH_TIMER_VIRT_EVT_EN;
+ arch_timer_set_cntkctl(cntkctl);
+ elf_hwcap |= HWCAP_EVTSTRM;
+#ifdef CONFIG_COMPAT
+ compat_elf_hwcap |= COMPAT_HWCAP_EVTSTRM;
+#endif
+}
+
static void arch_timer_configure_evtstream(void)
{
int evt_stream_div, pos;
--
1.9.1
prev parent reply other threads:[~2014-09-29 0:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-29 0:18 [GIT PULL] : clockevents/clocksource for 3.18 Daniel Lezcano
2014-09-29 0:23 ` [PATCH 01/13] clocksource: sh_cmt: Document SoC specific bindings Daniel Lezcano
2014-09-29 0:23 ` [PATCH 02/13] clocksource: sh_mtu2: Document r7s72100 binding Daniel Lezcano
2014-09-29 0:23 ` [PATCH 03/13] clocksource: sh_tmu: Document r8a7779 binding Daniel Lezcano
2014-09-29 0:23 ` [PATCH 04/13] ARM: meson: documentation: Add timer documentation Daniel Lezcano
2014-09-29 0:23 ` [PATCH 05/13] ARM: meson6: clocksource: Add Meson6 timer support Daniel Lezcano
2014-09-29 0:23 ` [PATCH 06/13] clocksource: vf_pit_timer: Support shutdown mode Daniel Lezcano
2014-09-29 0:23 ` [PATCH 07/13] clocksource: arm_arch_timer: Discard unavailable timers correctly Daniel Lezcano
2014-09-29 0:23 ` [PATCH 08/13] clocksource: tcb_clksrc: Sanitize IRQ request Daniel Lezcano
2014-09-29 0:23 ` [PATCH 09/13] clocksource: cadence_ttc: Add support for 32bit mode Daniel Lezcano
2014-09-29 0:23 ` [PATCH 10/13] clocksource: sirf: Disable counter before re-setting it Daniel Lezcano
2014-09-29 0:23 ` [PATCH 11/13] clocksource: arm_arch_timer: Change clocksource name if CP15 unavailable Daniel Lezcano
2014-09-29 0:23 ` [PATCH 12/13] clocksource: arm_arch_timer: Enable counter access for 32-bit ARM Daniel Lezcano
2014-09-29 0:23 ` Daniel Lezcano [this message]
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=1411950226-21598-13-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome