arm: arch_timer cleanups and niceties
Subsystems (8)
Mark Rutland
maintainerv2 cover arm: arch_timer cleanups and niceties
The following patches clean up some (harmless) fallout from the changes in 3.9, and make the driver always use the virtual counter, eliminating problems relating to choosing which counters to use (racy initialisation, branches in hot paths).
The patches can also be found in my public git tree:git://linux-arm.org/git/linux-mr.git clocks/arch-timer-cleanups
Since v1 [1]:
* Rebased to v3.10-rc1
* Fix up mach-shmobile's selection of ARCH_ARM_TIMER
Thanks,
Mark.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-March/158604.html
Marc Zyngier (2):
ARM: hyp: initialize CNTVOFF to zero
ARM: arch_timer: stop virtual timer when booted in HYP mode
Mark Rutland (3):
ARM: KVM: arch_timers: zero CNTVOFF upon return to host
clocksource: arch_timer: use virtual counters
arm: fix up ARM_ARCH_TIMER selects
arch/arm/include/asm/arch_timer.h | 9 --------- arch/arm/kernel/hyp-stub.S | 7 +++++++ arch/arm/kvm/interrupts_head.S | 4 ++++ arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 4 ++-- arch/arm/mach-tegra/Kconfig | 2 +- arch/arm/mach-virt/Kconfig | 2 +- arch/arm64/include/asm/arch_timer.h | 10 ---------- drivers/clocksource/arm_arch_timer.c | 23 +++++------------------ include/clocksource/arm_arch_timer.h | 2 +- 10 files changed, 22 insertions(+), 43 deletions(-)
Signature · 1 line
1.8.1.1
Mark Rutland
maintainerPATCH v2 1/5 ARM: hyp: initialize CNTVOFF to zero
From: Marc Zyngier <[email protected]>
In order to be able to use the virtual counter in a safe way, make sure it is initialized to zero before dropping to SVC.
--- arch/arm/kernel/hyp-stub.S | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/kernel/hyp-stub.S +2 -0
@@ -153,6 +153,8 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL orr r7, r7, #3 @ PL1PCEN | PL1PCTEN mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL + mov r7, #0 + mcrr p15, 4, r7, r7, c14 @ CNTVOFF 1: #endif
Signature · 1 line
1.8.1.1
Mark Rutland
maintainerPATCH v2 2/5 ARM: KVM: arch_timers: zero CNTVOFF upon return to host
In reply to Mark RutlandTo use the virtual counters from the host, we need to ensure that CNTVOFF doesn't change unexpectedly. When we change to a guest, we replace the host's CNTVOFF, but we don't restore it when returning to the host.
As the host sets CNTVOFF to zero, and never changes it, we can simply zero CNTVOFF when returning to the host. This patch adds said zeroing to the return to host path.
--- arch/arm/kvm/interrupts_head.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/kvm/interrupts_head.S +4 -0
@@ -497,6 +497,10 @@ vcpu .req r0 @ vcpu pointer always in r0 add r5, vcpu, r4 strd r2, r3, [r5] + @ Ensure host CNTVCT == CNTPCT + mov r2, #0 + mcrr p15, 4, r2, r2, c14 @ CNTVOFF + 1: #endif @ Allow physical timer/counter access for the host
Signature · 1 line
1.8.1.1
Mark Rutland
maintainerPATCH v2 3/5 clocksource: arch_timer: use virtual counters
In reply to Mark RutlandSwitching between reading the virtual or physical counters is problematic, as some core code wants a view of time before we're fully set up. Using a function pointer and switching the source after the first read can make time appear to go backwards, and having a check in the read function is an unfortunate block on what we want to be a fast path.
Instead, this patch makes us always use the virtual counters. If we're a guest, or don't have hyp mode, we'll use the virtual timers, and as such don't care about CNTVOFF as long as it doesn't change in such a way as to make time travel backwards. If we do have hyp mode, and might be a KVM host, we have to use the physical timers, and require CNTVOFF to be zero so as to have a consistent view of time between the physical timers and virtual counters.
--- arch/arm/include/asm/arch_timer.h | 9 --------- arch/arm64/include/asm/arch_timer.h | 10 ---------- drivers/clocksource/arm_arch_timer.c | 23 +++++------------------ include/clocksource/arm_arch_timer.h | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-)
arch/arm/include/asm/arch_timer.h +0 -9
@@ -80,15 +80,6 @@ static inline u32 arch_timer_get_cntfrq(void)return val; } -static inline u64 arch_counter_get_cntpct (void ) -{ -u64 cval; - -isb (); - asmvolatile ("mrrc p15, 0, %Q0, %R0, c14" :"=r" (cval)); -return cval; -} -static inline u64 arch_counter_get_cntvct (void ) {u64 cval;
arch/arm64/include/asm/arch_timer.h +0 -10
@@ -110,16 +110,6 @@ static inline void __cpuinit arch_counter_set_user_access(void) asmvolatile ("msr cntkctl_el1, %0" : :"r" (cntkctl)); } -static inline u64 arch_counter_get_cntpct (void ) -{ -u64 cval; - -isb (); - asmvolatile ("mrs %0, cntpct_el0" :"=r" (cval)); - -return cval; -} -static inline u64 arch_counter_get_cntvct (void ) {u64 cval;
drivers/clocksource/arm_arch_timer.c +5 -18
@@ -186,27 +186,19 @@ u32 arch_timer_get_rate(void)return arch_timer_rate; } -/* -* Some external users of arch_timer_read_counter (e.g. sched_clock) may try to -* call it before it has been initialised. Rather than incur a performance -* penalty checking for initialisation, provide a default implementation that -* won't lead to time appearing to jump backwards. -*/ -static u64 arch_timer_read_zero (void ) +u64 arch_timer_read_counter (void ) { -return 0 ; +return arch_counter_get_cntvct (); } -u64 (*arch_timer_read_counter)(void) = arch_timer_read_zero; -static cycle_t arch_counter_read (struct clocksource *cs) { -return arch_timer_read_counter (); +return arch_counter_get_cntvct (); }static cycle_t arch_counter_read_cc (const struct cyclecounter *cc) { -return arch_timer_read_counter (); +return arch_counter_get_cntvct (); }static struct clocksource clocksource_counter = {
@@ -287,7 +279,7 @@ static int __init arch_timer_register(void) cyclecounter.mult = clocksource_counter.mult; cyclecounter.shift = clocksource_counter.shift;timecounter_init (&timecounter, &cyclecounter, -arch_counter_get_cntpct ()); +arch_counter_get_cntvct ());if (arch_timer_use_virtual) { ppi = arch_timer_ppi[VIRT_PPI ];
@@ -376,11 +368,6 @@ static void __init arch_timer_init(struct device_node *np) } } -if (arch_timer_use_virtual) - arch_timer_read_counter = arch_counter_get_cntvct; -else - arch_timer_read_counter = arch_counter_get_cntpct; -arch_timer_register ();arch_timer_arch_init (); }
include/clocksource/arm_arch_timer.h +1 -1
@@ -32,7 +32,7 @@#ifdef CONFIG_ARM_ARCH_TIMER extern u32 arch_timer_get_rate (void ); -extern u64 (*arch_timer_read_counter)(void ); +extern u64 arch_timer_read_counter (void );extern struct timecounter *arch_timer_get_timecounter (void );#else
Signature · 1 line
1.8.1.1
PATCH v2 3/5 clocksource: arch_timer: use virtual counters
Hi Mark,
On 05/15/2013 11:23 AM, Mark Rutland wrote:
[...]
Quoted 7 lines
Instead, this patch makes us always use the virtual counters. If we're a guest, or don't have hyp mode, we'll use the virtual timers, and as such don't care about CNTVOFF as long as it doesn't change in such a way as to make time travel backwards. If we do have hyp mode, and might be a KVM host, we have to use the physical timers, and require CNTVOFF to be zero so as to have a consistent view of time between the physical timers and virtual counters.
[...]
drivers/clocksource/arm_arch_timer.c static int __init arch_timer_register(void) · line 285
Quoted 13 lines
drivers/clocksource/arm_arch_timer.c +1
-1@@ -287,7 +279,7 @@ static int __init arch_timer_register(void) cyclecounter.mult = clocksource_counter.mult; cyclecounter.shift = clocksource_counter.shift;timecounter_init (&timecounter, &cyclecounter, -arch_counter_get_cntpct ()); +arch_counter_get_cntvct ());if (arch_timer_use_virtual) { ppi = arch_timer_ppi[VIRT_PPI ];
[...]
You say "we have to use the physical timers", but then change the code to read exclusively from the virtual counter. I think it'd make more sense to just say that CNTVOFF has to be zero (and why exactly?).
Thanks,
Christopher
Signature · 3 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation.
Mark Rutland
maintainerPATCH v2 4/5 arm: fix up ARM_ARCH_TIMER selects
In reply to Mark RutlandIn 8a4da6e: "arm: arch_timer: move core to drivers/clocksource", the selection of ARM_ARCH_TIMER was indirected via HAVE_ARM_ARCH_TIMER, though mach-exynos's selection of ARM_ARCH_TIMER was missed, and since then mach-shmobile, mach-tegra, and mach-virt have begun selecting ARM_ARCH_TIMER. This can lead to architected timer support erroneously appearing to not be selected in menuconfig.
This patch fixes up the Kconfigs for those platforms to select HAVE_ARM_ARCH_TIMER.
--- arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 4 ++-- arch/arm/mach-tegra/Kconfig | 2 +- arch/arm/mach-virt/Kconfig | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-exynos/Kconfig +1 -1
@@ -76,7 +76,7 @@ config SOC_EXYNOS5440 default y depends on ARCH_EXYNOS5 select ARCH_HAS_OPP - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR select PINCTRL select PINCTRL_EXYNOS5440
arch/arm/mach-shmobile/Kconfig +2 -2
@@ -23,7 +23,7 @@ config ARCH_R8A73A4 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select SH_CLK_CPG select RENESAS_IRQC
@@ -56,7 +56,7 @@ config ARCH_R8A7790 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select SH_CLK_CPG select RENESAS_IRQC
arch/arm/mach-tegra/Kconfig +1 -1
@@ -60,7 +60,7 @@ config ARCH_TEGRA_3x_SOC config ARCH_TEGRA_114_SOC bool "Enable support for Tegra114 family" - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_GIC select ARM_L1_CACHE_SHIFT_6 select CPU_FREQ_TABLE if CPU_FREQ
arch/arm/mach-virt/Kconfig +1 -1
@@ -2,7 +2,7 @@ config ARCH_VIRT bool "Dummy Virtual Machine" if ARCH_MULTI_V7 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_PSCI select HAVE_SMP select CPU_V7
Signature · 1 line
1.8.1.1
PATCH v2 4/5 arm: fix up ARM_ARCH_TIMER selects
Quoted 16 lines · Mark Rutland
In 8a4da6e: "arm:
arch_timer: move core todrivers/clocksource", the selection ofARM_ARCH_TIMERwas indirected viaHAVE_ARM_ARCH_TIMER, though mach-exynos's selection ofARM_ARCH_TIMERwas missed, and since then mach-shmobile, mach-tegra, and mach-virt have begun selectingARM_ARCH_TIMER. This can lead to architected timer support erroneously appearing to not be selected in menuconfig.This patch fixes up the Kconfigs for those platforms to select
HAVE_ARM_ARCH_TIMER.Signed-off-by Mark Rutland <[email protected]>Acked-by Stephen Warren <[email protected]>Cc Kukjin Kim <[email protected]>Cc Marc Zyngier <[email protected]>Cc Simon Horman <[email protected]>
Quoted 6 lines
--- arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 4 ++-- arch/arm/mach-tegra/Kconfig | 2 +- arch/arm/mach-virt/Kconfig | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-shmobile/Kconfig portion:
Quoted 65 lines
arch/arm/mach-exynos/Kconfig +1
-1@@ -76,7 +76,7 @@ config SOC_EXYNOS5440 default y depends on ARCH_EXYNOS5 select ARCH_HAS_OPP - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR select PINCTRL select PINCTRL_EXYNOS5440arch/arm/mach-shmobile/Kconfig +2
-2@@ -23,7 +23,7 @@ config ARCH_R8A73A4 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select SH_CLK_CPG select RENESAS_IRQC@@ -56,7 +56,7 @@ config ARCH_R8A7790 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select SH_CLK_CPG select RENESAS_IRQCarch/arm/mach-tegra/Kconfig +1
-1@@ -60,7 +60,7 @@ config ARCH_TEGRA_3x_SOC config ARCH_TEGRA_114_SOC bool "Enable support for Tegra114 family" - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_GIC select ARM_L1_CACHE_SHIFT_6 select CPU_FREQ_TABLE if CPU_FREQarch/arm/mach-virt/Kconfig +1
-1@@ -2,7 +2,7 @@ config ARCH_VIRT bool "Dummy Virtual Machine" if ARCH_MULTI_V7 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC - select ARM_ARCH_TIMER + select HAVE_ARM_ARCH_TIMER select ARM_PSCI select HAVE_SMP select CPU_V7Signature · 1 line
1.8.1.1
Mark Rutland
maintainerPATCH v2 5/5 ARM: arch_timer: stop virtual timer when booted in HYP mode
In reply to Mark RutlandFrom: Marc Zyngier <[email protected]>
When booting the kernel, a bootloader could have left the virtual timer ticking away, potentially generating interrupts. This could be troublesome if the user of the virtual timer is not careful when enabling the interrupt.
In order to avoid any surprise, stop the virtual timer from interrupting us when booted in HYP mode, as we'll use the physical timer in this case.
--- arch/arm/kernel/hyp-stub.S | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/kernel/hyp-stub.S +5 -0
@@ -155,6 +155,11 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL mov r7, #0 mcrr p15, 4, r7, r7, c14 @ CNTVOFF + + @ Disable virtual timer in case it was counting + mrc p15, 0, r7, c14, c3, 1 @ CNTV_CTL + bic r7, #1 @ Clear ENABLE + mcr p15, 0, r7, c14, c3, 1 @ CNTV_CTL 1: #endif
Signature · 1 line
1.8.1.1