From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv5 03/16] arm: arch_timer: use u64/u32 for register data
Date: Thu, 31 Jan 2013 12:15:26 +0000 [thread overview]
Message-ID: <1359634539-9580-4-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1359634539-9580-1-git-send-email-mark.rutland@arm.com>
To ensure the correct size of types, use u64 for the return value of
arch_timer_get_cnt{p,v}ct, and u32 for arch_timer_rate, matching the
size of the registers these values are taken from. While we're changing
them anyway, simplify the implementation of arch_timer_get_cnt{p,v}ct.
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>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/kernel/arch_timer.c | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
index 1bb3b582..498c29f 100644
--- a/arch/arm/kernel/arch_timer.c
+++ b/arch/arm/kernel/arch_timer.c
@@ -25,7 +25,7 @@
#include <asm/arch_timer.h>
#include <asm/sched_clock.h>
-static unsigned long arch_timer_rate;
+static u32 arch_timer_rate;
enum ppi_nr {
PHYS_SECURE_PPI,
@@ -121,27 +121,18 @@ static inline u32 arch_timer_reg_read(const int access, const int reg)
return val;
}
-static inline cycle_t arch_timer_counter_read(const int access)
+static inline u64 arch_counter_get_cntpct(void)
{
- cycle_t cval = 0;
-
- if (access == ARCH_TIMER_PHYS_ACCESS)
- asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (cval));
-
- if (access == ARCH_TIMER_VIRT_ACCESS)
- asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (cval));
-
+ u64 cval;
+ asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (cval));
return cval;
}
-static inline cycle_t arch_counter_get_cntpct(void)
-{
- return arch_timer_counter_read(ARCH_TIMER_PHYS_ACCESS);
-}
-
-static inline cycle_t arch_counter_get_cntvct(void)
+static inline u64 arch_counter_get_cntvct(void)
{
- return arch_timer_counter_read(ARCH_TIMER_VIRT_ACCESS);
+ u64 cval;
+ asm volatile("mrrc p15, 1, %Q0, %R0, c14" : "=r" (cval));
+ return cval;
}
static irqreturn_t inline timer_handler(const int access,
@@ -259,7 +250,7 @@ static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
static int arch_timer_available(void)
{
- unsigned long freq;
+ u32 freq;
if (arch_timer_rate == 0) {
freq = arch_timer_reg_read(ARCH_TIMER_PHYS_ACCESS,
@@ -275,7 +266,8 @@ static int arch_timer_available(void)
}
pr_info_once("Architected local timer running at %lu.%02luMHz (%s).\n",
- arch_timer_rate / 1000000, (arch_timer_rate / 10000) % 100,
+ (unsigned long)arch_timer_rate / 1000000,
+ (unsigned long)(arch_timer_rate / 10000) % 100,
arch_timer_use_virtual ? "virt" : "phys");
return 0;
}
--
1.8.1.1
next prev parent reply other threads:[~2013-01-31 12:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 12:15 [PATCHv5 00/16] Unify arm_generic and arch_timer drivers Mark Rutland
2013-01-31 12:15 ` [PATCHv5 01/16] arm: arch_timer: balance device_node refcounting Mark Rutland
2013-01-31 15:33 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 02/16] arm: arch_timer: remove redundant available check Mark Rutland
2013-01-31 12:15 ` Mark Rutland [this message]
2013-01-31 12:15 ` [PATCHv5 04/16] arm: arch_timer: standardise counter reading Mark Rutland
2013-01-31 15:34 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 05/16] arm: arch_timer: split cntfrq accessor Mark Rutland
2013-01-31 12:15 ` [PATCHv5 06/16] arm: arch_timer: factor out register accessors Mark Rutland
2013-01-31 12:15 ` [PATCHv5 07/16] arm: arch_timer: add isbs to " Mark Rutland
2013-01-31 15:35 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 08/16] arm: arch_timer: divorce from local_timer api Mark Rutland
2013-01-31 12:15 ` [PATCHv5 09/16] arm: arch_timer: add arch_counter_set_user_access Mark Rutland
2013-01-31 15:36 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 10/16] arm: arch_timer: move core to drivers/clocksource Mark Rutland
2013-01-31 12:15 ` [PATCHv5 11/16] arm64: arm_generic: prevent reading stale time Mark Rutland
2013-01-31 15:36 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 12/16] arm64: move from arm_generic to arm_arch_timer Mark Rutland
2013-01-31 12:15 ` [PATCHv5 13/16] Documentation: Add ARMv8 to arch_timer devicetree Mark Rutland
2013-01-31 12:15 ` [PATCHv5 14/16] ARM: arch_timers: switch to physical timers if HYP mode is available Mark Rutland
2013-01-31 15:37 ` Catalin Marinas
2013-01-31 12:15 ` [PATCHv5 15/16] ARM: hyp: initialize CNTVOFF to zero Mark Rutland
2013-02-01 11:13 ` Dave Martin
2013-02-01 11:43 ` Marc Zyngier
2013-02-01 11:46 ` Mark Rutland
2013-02-01 18:07 ` Dave Martin
2013-02-04 9:29 ` Mark Rutland
2013-01-31 12:15 ` [PATCHv5 16/16] clocksource: arch_timer: use virtual counters Mark Rutland
2013-01-31 15:38 ` Catalin Marinas
2013-01-31 17:39 ` [PATCHv5 00/16] Unify arm_generic and arch_timer drivers Stephen Warren
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=1359634539-9580-4-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).