From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/10] arm: arch_timer: add arch_counter_enable_user_access
Date: Fri, 30 Nov 2012 17:46:05 +0000 [thread overview]
Message-ID: <1354297568-26366-8-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1354297568-26366-1-git-send-email-mark.rutland@arm.com>
Several bits in CNTKCTL reset to 0, including PL0VTEN. For platforms
using the generic timer which wish to have a fast gettimeofday vDSO
implementation, these bits must be set to 1 by the kernel.
Add an arch_counter_enable_user_access function for this. As we don't
(currently) use the counter from PL0 on arm, the implementation is an
empty stub.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/include/asm/arch_timer.h | 7 +++++++
arch/arm/kernel/arch_timer.c | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 701f2b7..c50e415 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -108,6 +108,13 @@ static inline u64 arch_counter_get_cntvct(void)
return cval;
}
+static inline void __cpuinit arch_counter_enable_user_access(void)
+{
+ /*
+ * Do nothing - the counter is never mapped to userspace threads,
+ * so we don't care whether access is enabled or not.
+ */
+}
#else
static inline int arch_timer_of_register(void)
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index 10e1657..28b29f0 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -155,6 +155,8 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
enable_percpu_irq(arch_timer_ppi[PHYS_NONSECURE_PPI], 0);
}
+ arch_counter_enable_user_access();
+
return 0;
}
--
1.7.0.4
next prev parent reply other threads:[~2012-11-30 17:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-30 17:45 [PATCH 00/10] Unify arm_generic and arch_timer drivers Mark Rutland
2012-11-30 17:45 ` [PATCH 01/10] arm: arch_timer: remove redundant available check Mark Rutland
2012-11-30 17:46 ` [PATCH 02/10] arm: arch_timer: use u64/u32 for register data Mark Rutland
2012-11-30 17:46 ` [PATCH 03/10] arm: arch_timer: standardise counter reading Mark Rutland
2012-11-30 17:46 ` [PATCH 04/10] arm: arch_timer: split cntfrq accessor Mark Rutland
2012-11-30 17:46 ` [PATCH 05/10] arm: arch_timer: factor out register accessors Mark Rutland
2012-11-30 17:46 ` [PATCH 06/10] arm: arch_timer: divorce from local_timer api Mark Rutland
2012-12-07 22:16 ` Stephen Boyd
2012-12-10 11:09 ` Mark Rutland
2012-12-18 12:20 ` Mark Rutland
2012-11-30 17:46 ` Mark Rutland [this message]
2012-11-30 19:32 ` [PATCH 07/10] arm: arch_timer: add arch_counter_enable_user_access Will Deacon
2012-12-03 10:24 ` Mark Rutland
2012-11-30 17:46 ` [PATCH 08/10] arm: arch_timer: move core to drivers/clocksource Mark Rutland
2012-11-30 17:46 ` [PATCH 09/10] arm64: move from arm_generic to arm_arch_timer Mark Rutland
2012-11-30 19:36 ` Will Deacon
2012-11-30 17:46 ` [PATCH 10/10] Documentation: Add ARMv8 to arch_timer devicetree Mark Rutland
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=1354297568-26366-8-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).