From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 14 Oct 2012 04:05:53 +0000 (-0700)
Subject: 3.6-stable patches
X-Git-Tag: v3.0.47~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fe6f2202c79e90314fc7296cd9e4f139b2f32a5;p=thirdparty%2Fkernel%2Fstable-queue.git

3.6-stable patches

added patches:
	arm-vfp-fix-saving-d16-d31-vfp-registers-on-v6-kernels.patch
---

diff --git a/queue-3.6/arm-vfp-fix-saving-d16-d31-vfp-registers-on-v6-kernels.patch b/queue-3.6/arm-vfp-fix-saving-d16-d31-vfp-registers-on-v6-kernels.patch
new file mode 100644
index 00000000000..2ca59328061
--- /dev/null
+++ b/queue-3.6/arm-vfp-fix-saving-d16-d31-vfp-registers-on-v6-kernels.patch
@@ -0,0 +1,60 @@
+From 846a136881b8f73c1f74250bf6acfaa309cab1f2 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Tue, 9 Oct 2012 11:13:26 +0100
+Subject: ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels
+
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+
+commit 846a136881b8f73c1f74250bf6acfaa309cab1f2 upstream.
+
+Michael Olbrich reported that his test program fails when built with
+-O2 -mcpu=cortex-a8 -mfpu=neon, and a kernel which supports v6 and v7
+CPUs:
+
+volatile int x = 2;
+volatile int64_t y = 2;
+
+int main() {
+	volatile int a = 0;
+	volatile int64_t b = 0;
+	while (1) {
+		a = (a + x) % (1 << 30);
+		b = (b + y) % (1 << 30);
+		assert(a == b);
+	}
+}
+
+and two instances are run.  When built for just v7 CPUs, this program
+works fine.  It uses the "vadd.i64 d19, d18, d16" VFP instruction.
+
+It appears that we do not save the high-16 double VFP registers across
+context switches when the kernel is built for v6 CPUs.  Fix that.
+
+Tested-By: Michael Olbrich <m.olbrich@pengutronix.de>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/include/asm/vfpmacros.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/include/asm/vfpmacros.h
++++ b/arch/arm/include/asm/vfpmacros.h
+@@ -28,7 +28,7 @@
+ 	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs
+ 	ldr	\tmp, [\tmp, #0]
+ 	tst	\tmp, #HWCAP_VFPv3D16
+-	ldceq	p11, cr0, [\base],#32*4		    @ FLDMIAD \base!, {d16-d31}
++	ldceql	p11, cr0, [\base],#32*4		    @ FLDMIAD \base!, {d16-d31}
+ 	addne	\base, \base, #32*4		    @ step over unused register space
+ #else
+ 	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0
+@@ -52,7 +52,7 @@
+ 	ldr	\tmp, =elf_hwcap		    @ may not have MVFR regs
+ 	ldr	\tmp, [\tmp, #0]
+ 	tst	\tmp, #HWCAP_VFPv3D16
+-	stceq	p11, cr0, [\base],#32*4		    @ FSTMIAD \base!, {d16-d31}
++	stceql	p11, cr0, [\base],#32*4		    @ FSTMIAD \base!, {d16-d31}
+ 	addne	\base, \base, #32*4		    @ step over unused register space
+ #else
+ 	VFPFMRX	\tmp, MVFR0			    @ Media and VFP Feature Register 0
diff --git a/queue-3.6/series b/queue-3.6/series
new file mode 100644
index 00000000000..886bbb89898
--- /dev/null
+++ b/queue-3.6/series
@@ -0,0 +1 @@
+arm-vfp-fix-saving-d16-d31-vfp-registers-on-v6-kernels.patch