Tue Feb 18 01:56:27 UTC 2014

4 files changed, 193 insertions, 25 deletions

diff --git a/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch b/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch
new file mode 100644
index 000000000..c9ee40400
--- /dev/null
+++ b/libre-testing/linux-libre/0001-quirk-asm_volatile_goto.patch
@@ -0,0 +1,51 @@
+From a9f180345f5378ac87d80ed0bea55ba421d83859 Mon Sep 17 00:00:00 2001
+From: Steven Noonan <steven@uplinklabs.net>
+Date: Thu, 13 Feb 2014 07:01:07 +0000
+Subject: compiler/gcc4: Make quirk for asm_volatile_goto() unconditional
+
+I started noticing problems with KVM guest destruction on Linux
+3.12+, where guest memory wasn't being cleaned up. I bisected it
+down to the commit introducing the new 'asm goto'-based atomics,
+and found this quirk was later applied to those.
+
+Unfortunately, even with GCC 4.8.2 (which ostensibly fixed the
+known 'asm goto' bug) I am still getting some kind of
+miscompilation. If I enable the asm_volatile_goto quirk for my
+compiler, KVM guests are destroyed correctly and the memory is
+cleaned up.
+
+So make the quirk unconditional for now, until bug is found
+and fixed.
+
+Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Steven Noonan <steven@uplinklabs.net>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Jakub Jelinek <jakub@redhat.com>
+Cc: Richard Henderson <rth@twiddle.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Oleg Nesterov <oleg@redhat.com>
+Cc: <stable@vger.kernel.org>
+Link: http://lkml.kernel.org/r/1392274867-15236-1-git-send-email-steven@uplinklabs.net
+Link: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+---
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+index ded4299..2507fd2 100644
+--- a/include/linux/compiler-gcc4.h
++++ b/include/linux/compiler-gcc4.h
+@@ -75,11 +75,7 @@
+  *
+  * (asm goto is automatically volatile - the naming reflects this.)
+  */
+-#if GCC_VERSION <= 40801
+-# define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-#else
+-# define asm_volatile_goto(x...)	do { asm goto(x); } while (0)
+-#endif
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+ 
+ #ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+ #if GCC_VERSION >= 40400
+--
+cgit v0.9.2
diff --git a/libre-testing/linux-libre/ChangeLog b/libre-testing/linux-libre/ChangeLog
index 9020464ef..5259f3e89 100644
--- a/libre-testing/linux-libre/ChangeLog
+++ b/libre-testing/linux-libre/ChangeLog
@@ -1,8 +1,3 @@
-2013-10-20  André Silva  <emulatorman@parabola.nu>
-
-        * linux-libre-3.11.5-1
-        * Replaced email account emulatorman@lavabit.com to emulatorman@parabola.nu.
-
 2013-07-15  André Silva  <emulatorman@parabola.nu>
 
         * linux-libre-3.10.1-1
@@ -18,27 +13,27 @@
 	* linux-libre-3.7.1-1
 	* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 
-2012-06-23  André Silva  <emulatorman@parabola.nu>
-
-	* linux-libre-3.4.4-1
-	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
-
 2012-05-26  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.4-1.2
-	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
+	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules [3]
 
 2012-04-24  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.3-1
-	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
+	* Disabled CONFIG_STUB_POULSBO module [2]
 
 2012-04-08  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.1-1.1
-	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules [1]
 
 2012-03-03  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.2.9-2
-	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
+	* Enabled CONFIG_FB_VT8623 module [0]
+
+[0] https://labs.parabola.nu/issues/14
+[1] https://labs.parabola.nu/issues/47
+[2] https://labs.parabola.nu/issues/90
+[3] https://labs.parabola.nu/issues/116
diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD
index 78acfe3e1..09d3b6d49 100644
--- a/libre-testing/linux-libre/PKGBUILD
+++ b/libre-testing/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204729 2014-01-26 08:54:46Z thomas $
+# $Id: PKGBUILD 205930 2014-02-14 08:13:44Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,18 +10,17 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.13
-#_sublevel=8
-#pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}
+_sublevel=3
+pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -38,11 +37,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '0005-sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch'
         '0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
         '0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+        '0001-quirk-asm_volatile_goto.patch'
+        'i8042-fix-aliases.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         #'392f920129940c4f83c7d204468213f3'
-         '568ce15a9df133072489cbac8c4fefb3'
-         '772873c548059c57c8ec7898f35c0e2b'
+         'de4e4158ff1711cd57196f323358d0ec'
+         'b6a3a3f9cac1be38384241ad58d45d46'
+         '3740951ae165b89a2139d45ae7d82173'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -56,7 +57,9 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
          'd5907a721b97299f0685c583499f7820'
          'a724515b350b29c53f20e631c6cf9a14'
          'e6fa278c092ad83780e2dd0568e24ca6'
-         '7e16faa84d4cd04e43bca12bdf9d9e4b')
+         '6baa312bc166681f48e972824f3f6649'
+         '93dbf73af819b77f03453a9c6de2bb47'
+         'cffddbeccd11e296654374b0a1f1bbf9')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -106,6 +109,12 @@ prepare() {
   # Fix symbols: Revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=83460ec8dcac14142e7860a01fa59c267ac4657c
   patch -Rp1 -i "${srcdir}/0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch"
 
+  # Fix i8042 aliases
+  patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
+  # Fix compile issues
+  # http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/patch/?id=a9f180345f5378ac87d80ed0bea55ba421d83859
+  patch -Np1 -i "${srcdir}/0001-quirk-asm_volatile_goto.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre-testing/linux-libre/i8042-fix-aliases.patch b/libre-testing/linux-libre/i8042-fix-aliases.patch
new file mode 100644
index 000000000..961968c78
--- /dev/null
+++ b/libre-testing/linux-libre/i8042-fix-aliases.patch
@@ -0,0 +1,113 @@
+commit 5a420e61e39862c7c3356080eddb23dfe4ccadb7

+Author: Tom Gundersen <teg@jklm.no>

+Date:   Sun Jan 26 17:00:32 2014 +0100

+

+    Input: i8042 - fix PNP modaliases when both aux and kdb are enabled

+    

+    Commit 78551277e4 exposed the PNP modaliases for the i8042 module. However,

+    when both the aux and the kbd drivers are enabled the aux entries would

+    override the kdb ones.

+    

+    Refactor the device_id lists, and unconditionally attempt to load the driver

+    if either a kdb or aux devices is present.

+    

+    Signed-off-by: Tom Gundersen <teg@jklm.no>

+

+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h

+index 0ec9abb..dbc6958 100644

+--- a/drivers/input/serio/i8042-x86ia64io.h

++++ b/drivers/input/serio/i8042-x86ia64io.h

+@@ -747,25 +747,27 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *

+ 	return 0;

+ }

+ 

+-static struct pnp_device_id pnp_kbd_devids[] = {

+-	{ .id = "PNP0300", .driver_data = 0 },

+-	{ .id = "PNP0301", .driver_data = 0 },

+-	{ .id = "PNP0302", .driver_data = 0 },

+-	{ .id = "PNP0303", .driver_data = 0 },

+-	{ .id = "PNP0304", .driver_data = 0 },

+-	{ .id = "PNP0305", .driver_data = 0 },

+-	{ .id = "PNP0306", .driver_data = 0 },

+-	{ .id = "PNP0309", .driver_data = 0 },

+-	{ .id = "PNP030a", .driver_data = 0 },

+-	{ .id = "PNP030b", .driver_data = 0 },

+-	{ .id = "PNP0320", .driver_data = 0 },

+-	{ .id = "PNP0343", .driver_data = 0 },

+-	{ .id = "PNP0344", .driver_data = 0 },

+-	{ .id = "PNP0345", .driver_data = 0 },

++#define KBD_DEVIDS \

++	{ .id = "PNP0300", .driver_data = 0 }, \

++	{ .id = "PNP0301", .driver_data = 0 }, \

++	{ .id = "PNP0302", .driver_data = 0 }, \

++	{ .id = "PNP0303", .driver_data = 0 }, \

++	{ .id = "PNP0304", .driver_data = 0 }, \

++	{ .id = "PNP0305", .driver_data = 0 }, \

++	{ .id = "PNP0306", .driver_data = 0 }, \

++	{ .id = "PNP0309", .driver_data = 0 }, \

++	{ .id = "PNP030a", .driver_data = 0 }, \

++	{ .id = "PNP030b", .driver_data = 0 }, \

++	{ .id = "PNP0320", .driver_data = 0 }, \

++	{ .id = "PNP0343", .driver_data = 0 }, \

++	{ .id = "PNP0344", .driver_data = 0 }, \

++	{ .id = "PNP0345", .driver_data = 0 }, \

+ 	{ .id = "CPQA0D7", .driver_data = 0 },

++

++static struct pnp_device_id pnp_kbd_devids[] = {

++	KBD_DEVIDS

+ 	{ .id = "", },

+ };

+-MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);

+ 

+ static struct pnp_driver i8042_pnp_kbd_driver = {

+ 	.name           = "i8042 kbd",

+@@ -773,21 +775,23 @@ static struct pnp_driver i8042_pnp_kbd_driver = {

+ 	.probe          = i8042_pnp_kbd_probe,

+ };

+ 

+-static struct pnp_device_id pnp_aux_devids[] = {

+-	{ .id = "AUI0200", .driver_data = 0 },

+-	{ .id = "FJC6000", .driver_data = 0 },

+-	{ .id = "FJC6001", .driver_data = 0 },

+-	{ .id = "PNP0f03", .driver_data = 0 },

+-	{ .id = "PNP0f0b", .driver_data = 0 },

+-	{ .id = "PNP0f0e", .driver_data = 0 },

+-	{ .id = "PNP0f12", .driver_data = 0 },

+-	{ .id = "PNP0f13", .driver_data = 0 },

+-	{ .id = "PNP0f19", .driver_data = 0 },

+-	{ .id = "PNP0f1c", .driver_data = 0 },

++#define AUX_DEVIDS \

++	{ .id = "AUI0200", .driver_data = 0 }, \

++	{ .id = "FJC6000", .driver_data = 0 }, \

++	{ .id = "FJC6001", .driver_data = 0 }, \

++	{ .id = "PNP0f03", .driver_data = 0 }, \

++	{ .id = "PNP0f0b", .driver_data = 0 }, \

++	{ .id = "PNP0f0e", .driver_data = 0 }, \

++	{ .id = "PNP0f12", .driver_data = 0 }, \

++	{ .id = "PNP0f13", .driver_data = 0 }, \

++	{ .id = "PNP0f19", .driver_data = 0 }, \

++	{ .id = "PNP0f1c", .driver_data = 0 }, \

+ 	{ .id = "SYN0801", .driver_data = 0 },

++

++static struct pnp_device_id pnp_aux_devids[] = {

++	AUX_DEVIDS

+ 	{ .id = "", },

+ };

+-MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);

+ 

+ static struct pnp_driver i8042_pnp_aux_driver = {

+ 	.name           = "i8042 aux",

+@@ -795,6 +799,13 @@ static struct pnp_driver i8042_pnp_aux_driver = {

+ 	.probe          = i8042_pnp_aux_probe,

+ };

+ 

++static struct pnp_device_id pnp_kdb_aux_devids[] = {

++	KBD_DEVIDS

++	AUX_DEVIDS

++	{ .id = "", },

++};

++MODULE_DEVICE_TABLE(pnp, pnp_kdb_aux_devids);

++

+ static void i8042_pnp_exit(void)

+ {

+ 	if (i8042_pnp_kbd_registered) {