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

Commit 992dd16f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: arch_timer: Move clocksource_counter and co around 



In order to access clocksource_counter from the errata handling code,
move it (together with the related structures and functions) towards
the top of the file.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 6acc71cc

drivers/clocksource/arm_arch_timer.c

+31 −31
Original line number Diff line number Diff line
@@ -158,6 +158,37 @@ u32 arch_timer_reg_read(int access, enum arch_timer_reg reg, 
	return val;

}



/*

 * Default to cp15 based access because arm64 uses this function for

 * sched_clock() before DT is probed and the cp15 method is guaranteed

 * to exist on arm64. arm doesn't use this before DT is probed so even

 * if we don't have the cp15 accessors we won't have a problem.

 */

u64 (*arch_timer_read_counter)(void) = arch_counter_get_cntvct;



static u64 arch_counter_read(struct clocksource *cs)

{

	return arch_timer_read_counter();

}



static u64 arch_counter_read_cc(const struct cyclecounter *cc)

{

	return arch_timer_read_counter();

}



static struct clocksource clocksource_counter = {

	.name	= "arch_sys_counter",

	.rating	= 400,

	.read	= arch_counter_read,

	.mask	= CLOCKSOURCE_MASK(56),

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

};



static struct cyclecounter cyclecounter __ro_after_init = {

	.read	= arch_counter_read_cc,

	.mask	= CLOCKSOURCE_MASK(56),

};



#ifdef CONFIG_FSL_ERRATUM_A008585

/*

 * The number of retries is an arbitrary value well beyond the highest number
@@ -742,37 +773,6 @@ static u64 arch_counter_get_cntvct_mem(void) 
	return ((u64) vct_hi << 32) | vct_lo;

}



/*

 * Default to cp15 based access because arm64 uses this function for

 * sched_clock() before DT is probed and the cp15 method is guaranteed

 * to exist on arm64. arm doesn't use this before DT is probed so even

 * if we don't have the cp15 accessors we won't have a problem.

 */

u64 (*arch_timer_read_counter)(void) = arch_counter_get_cntvct;



static u64 arch_counter_read(struct clocksource *cs)

{

	return arch_timer_read_counter();

}



static u64 arch_counter_read_cc(const struct cyclecounter *cc)

{

	return arch_timer_read_counter();

}



static struct clocksource clocksource_counter = {

	.name	= "arch_sys_counter",

	.rating	= 400,

	.read	= arch_counter_read,

	.mask	= CLOCKSOURCE_MASK(56),

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

};



static struct cyclecounter cyclecounter __ro_after_init = {

	.read	= arch_counter_read_cc,

	.mask	= CLOCKSOURCE_MASK(56),

};



static struct arch_timer_kvm_info arch_timer_kvm_info;



struct arch_timer_kvm_info *arch_timer_get_kvm_info(void)