renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

arm64: generic timer: use virtual counter instead of physical at EL0

Browse Source 
We want to use the virtual counter at EL0, as the physical counter
may not track the current clocksource for guests running under a
hypervisor.

This patch updates the vdso and generic timer driver to use the virtual
counter. The kernel EL2 entry code is also updated to ensure that the
virtual offset is initialised to zero.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Will Deacon 2012-11-29 22:48:31 +00:00 committed by Catalin Marinas
parent 45a7905fc4
commit 1f75ff0a3d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/include/asm/arm_generic.h
View File

@ -70,12 +70,12 @@ static inline void __cpuinit arch_counter_enable_user_access(void)
{ {
u32 cntkctl; u32 cntkctl;
/* Disable user access to the timers and the virtual counter. */ /* Disable user access to the timers and the physical counter. */
asm volatile("mrs %0, cntkctl_el1" : "=r" (cntkctl)); asm volatile("mrs %0, cntkctl_el1" : "=r" (cntkctl));
cntkctl &= ~((3 << 8) | (1 << 1)); cntkctl &= ~((3 << 8) | (1 << 0));
/* Enable user access to the physical counter and frequency. */ /* Enable user access to the virtual counter and frequency. */
cntkctl |= 1; cntkctl |= (1 << 1);
asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl)); asm volatile("msr cntkctl_el1, %0" : : "r" (cntkctl));
} }

1
arch/arm64/kernel/head.S
View File

@ -158,6 +158,7 @@ ENTRY(el2_setup)
mrs x0, cnthctl_el2 mrs x0, cnthctl_el2
orr x0, x0, #3 // Enable EL1 physical timers orr x0, x0, #3 // Enable EL1 physical timers
msr cnthctl_el2, x0 msr cnthctl_el2, x0
msr cntvoff_el2, xzr // Clear virtual offset
/* Populate ID registers. */ /* Populate ID registers. */
mrs x0, midr_el1 mrs x0, midr_el1

4
arch/arm64/kernel/vdso/gettimeofday.S
View File

@ -220,9 +220,9 @@ ENTRY(__do_get_tspec)
ldp w11, w12, [vdso_data, #VDSO_CS_MULT] ldp w11, w12, [vdso_data, #VDSO_CS_MULT]
seqcnt_read w9 seqcnt_read w9
/* Read the physical counter. */ /* Read the virtual counter. */
isb isb
mrs x15, cntpct_el0 mrs x15, cntvct_el0
/* Calculate cycle delta and convert to ns. */ /* Calculate cycle delta and convert to ns. */
sub x10, x15, x10 sub x10, x15, x10

2
drivers/clocksource/arm_generic.c
View File

@ -109,7 +109,7 @@ static void __cpuinit arch_timer_setup(struct clock_event_device *clk)
enable_percpu_irq(clk->irq, 0); enable_percpu_irq(clk->irq, 0);
/* Ensure the physical counter is visible to userspace for the vDSO. */ /* Ensure the virtual counter is visible to userspace for the vDSO. */
arch_counter_enable_user_access(); arch_counter_enable_user_access();
} }