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

Commit b4d6ce97 authored by Julien Grall's avatar Julien Grall Committed by Christoffer Dall
Browse files

clocksource: arm_arch_timer: Gather KVM specific information in a structure 



Introduce a structure which are filled up by the arch timer driver and
used by the virtual timer in KVM.

The first member of this structure will be the timecounter. More members
will be added later.

A stub for the new helper isn't introduced because KVM requires the arch
timer for both ARM64 and ARM32.

The function arch_timer_get_timecounter is kept for the time being and
will be dropped in a subsequent patch.

Signed-off-by: default avatarJulien Grall <julien.grall@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent d4b9e079

drivers/clocksource/arm_arch_timer.c

+9 −3
Original line number Diff line number Diff line
@@ -468,11 +468,16 @@ static struct cyclecounter cyclecounter = { 
	.mask	= CLOCKSOURCE_MASK(56),

};



static struct timecounter timecounter;

static struct arch_timer_kvm_info arch_timer_kvm_info;



struct arch_timer_kvm_info *arch_timer_get_kvm_info(void)

{

	return &arch_timer_kvm_info;

}



struct timecounter *arch_timer_get_timecounter(void)

{

	return &timecounter;

	return &arch_timer_kvm_info.timecounter;

}



static void __init arch_counter_register(unsigned type)
@@ -500,7 +505,8 @@ static void __init arch_counter_register(unsigned type) 
	clocksource_register_hz(&clocksource_counter, arch_timer_rate);

	cyclecounter.mult = clocksource_counter.mult;

	cyclecounter.shift = clocksource_counter.shift;

	timecounter_init(&timecounter, &cyclecounter, start_count);

	timecounter_init(&arch_timer_kvm_info.timecounter,

			 &cyclecounter, start_count);



	/* 56 bits minimum, so we assume worst case rollover */

	sched_clock_register(arch_timer_read_counter, 56, arch_timer_rate);

include/clocksource/arm_arch_timer.h

+5 −0
Original line number Diff line number Diff line
@@ -49,11 +49,16 @@ enum arch_timer_reg { 


#define ARCH_TIMER_EVT_STREAM_FREQ	10000	/* 100us */



struct arch_timer_kvm_info {

	struct timecounter timecounter;

};



#ifdef CONFIG_ARM_ARCH_TIMER



extern u32 arch_timer_get_rate(void);

extern u64 (*arch_timer_read_counter)(void);

extern struct timecounter *arch_timer_get_timecounter(void);

extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void);



#else