Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef01c1d1 authored by Mark Rutland's avatar Mark Rutland
Browse files

arm: arch_timer: use u64/u32 for register data 



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: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent ef201de4

arch/arm/kernel/arch_timer.c

+11 −19
Original line number Diff line number Diff line
@@ -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)

	u64 cval;

	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));



	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;

}