[kernel] r22337 - in dists/sid/linux/debian: . patches patches/bugfix/arm64

[Ian James Campbell]

Author: ijc
Date: Tue Feb  3 09:20:15 2015
New Revision: 22337

Log:
[arm64] Only use the virtual counter (CNTVCT) on arm64.

Added:
   dists/sid/linux/debian/patches/bugfix/arm64/clocksource-arch_timer-Only-use-the-virtual-counter-.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Feb  3 01:37:04 2015	(r22336)
+++ dists/sid/linux/debian/changelog	Tue Feb  3 09:20:15 2015	(r22337)
@@ -7,6 +7,7 @@
 
   [ Ian Campbell ]
   * [xen] cancel ballooning if adding new memory failed (Closes: #776448)
+  * [arm64] Only use the virtual counter (CNTVCT) on arm64.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 28 Jan 2015 17:52:39 +0000
 

Added: dists/sid/linux/debian/patches/bugfix/arm64/clocksource-arch_timer-Only-use-the-virtual-counter-.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/arm64/clocksource-arch_timer-Only-use-the-virtual-counter-.patch	Tue Feb  3 09:20:15 2015	(r22337)
@@ -0,0 +1,40 @@
+From 53a2dd7f567cebda868b0765e2659f7930ba958f Mon Sep 17 00:00:00 2001
+From: Catalin Marinas <catalin.marinas at arm.com>
+Date: Wed, 10 Dec 2014 11:02:09 +0000
+Subject: [PATCH] clocksource: arch_timer: Only use the virtual counter
+ (CNTVCT) on arm64
+Origin: https://git.kernel.org/linus/d6ad36913083d683aad4e02e53580c995f1a6ede
+
+Commit 0b46b8a718c6 (clocksource: arch_timer: Fix code to use physical
+timers when requested) introduces the use of physical counters in the
+ARM architected timer driver. However, he arm64 kernel uses CNTVCT in
+VDSO. When booting in EL2, the kernel switches to the physical timers to
+make things easier for KVM but it continues to use the virtual counter
+both in user and kernel. While in such scenario CNTVCT == CNTPCT (since
+CNTVOFF is initialised by the kernel to 0), we want to spot firmware
+bugs corrupting CNTVOFF early (which would affect CNTVCT).
+
+Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
+Tested-by: Yingjoe Chen <yingjoe.chen at mediatek.com>
+Cc: Daniel Lezcano <daniel.lezcano at linaro.org>
+Signed-off-by: Arnd Bergmann <arnd at arndb.de>
+---
+ drivers/clocksource/arm_arch_timer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
+index 506949d..499cb1d 100644
+--- a/drivers/clocksource/arm_arch_timer.c
++++ b/drivers/clocksource/arm_arch_timer.c
+@@ -430,7 +430,7 @@ static void __init arch_counter_register(unsigned type)
+ 
+ 	/* Register the CP15 based counter if we have one */
+ 	if (type & ARCH_CP15_TIMER) {
+-		if (arch_timer_use_virtual)
++		if (IS_ENABLED(CONFIG_ARM64) || arch_timer_use_virtual)
+ 			arch_timer_read_counter = arch_counter_get_cntvct;
+ 		else
+ 			arch_timer_read_counter = arch_counter_get_cntpct;
+-- 
+1.7.10.4
+

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Tue Feb  3 01:37:04 2015	(r22336)
+++ dists/sid/linux/debian/patches/series	Tue Feb  3 09:20:15 2015	(r22337)
@@ -56,6 +56,7 @@
 bugfix/parisc/parisc-reduce-sigrtmin-from-37-to-32-to-behave-like-.patch
 bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
 bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
+bugfix/arm64/clocksource-arch_timer-Only-use-the-virtual-counter-.patch
 bugfix/x86/acpi-video-run-_bcl-before-deciding-registering-back.patch
 
 # Arch features