Sun Jan 22 23:15:13 UTC 2012

7 files changed, 173 insertions, 65 deletions

diff --git a/libre/linux-libre/Kbuild b/libre/linux-libre/Kbuild
new file mode 100644
index 000000000..8a9d7dceb
--- /dev/null
+++ b/libre/linux-libre/Kbuild
@@ -0,0 +1,19 @@
+# Fail on warnings - also for files referenced in subdirs
+# -Werror can be disabled for specific files using:
+# CFLAGS_<file.o> := -Wno-error
+subdir-ccflags-y := -Wno-error
+
+# platform specific definitions
+include arch/mips/Kbuild.platforms
+obj-y := $(platform-y)
+
+# make clean traverses $(obj-) without having included .config, so
+# everything ends up here
+obj- := $(platform-)
+
+# mips object files
+# The object files are linked as core-y files would be linked
+
+obj-y += kernel/
+obj-y += mm/
+obj-y += math-emu/
diff --git a/libre/linux-libre/Kbuild.platforms b/libre/linux-libre/Kbuild.platforms
new file mode 100644
index 000000000..90a226888
--- /dev/null
+++ b/libre/linux-libre/Kbuild.platforms
@@ -0,0 +1,6 @@
+# All platforms listed in alphabetic order
+
+platforms += loongson
+
+# include the platform specific files
+include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index e7668ca29..3bd2c7fe6 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -8,48 +8,42 @@ pkgbase=linux-libre
 pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
-<<<<<<< HEAD
-_basekernel=3.1
-pkgver=${_basekernel}.7
-=======
 _basekernel=3.2
-pkgver=${_basekernel}
->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
+pkgver=${_basekernel}.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-#        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "${pkgname}.preset"
+        'Kbuild'
+        'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'usb-add-reset-resume-quirk-for-several-webcams.patch')
-md5sums=('d73df15ab1d36fe3c102755d8f42117f'
-         '47e4a10500ad90694b7f42fb447ab810'
-         '267ea59695619730032f89ac70bf9391'
-         '5a415fc0c864dc3f5c4afa63f1506c52'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '263725f20c0b9eb9c353040792d644e5'
-         'a50c9076012cb2dda49952dc6ec3e9c1'
-         '52d41fa61e80277ace2b994412a0c856')
+        'i915-gpu-finish.patch')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-#  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+  fi
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
+  # fix FS#27883
+  # drm/i915: Only clear the GPU domains upon a successful finish
+  patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
+
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
@@ -59,16 +53,26 @@ build() {
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # Add the USB_QUIRK_RESET_RESUME for several webcams
-  # FS#26528
-  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
+    msg2 "Adding loongson-community patches"
+    patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch
+    patch -Np0 -i "${srcdir}/lxo-config.patch"
+
+# ensure N32, add localversion and remove uevent helper as per
+# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+  else
+    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  fi
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -98,7 +102,11 @@ build() {
   yes "" | make config
 
   # build!
-  make ${MAKEFLAGS} bzImage modules
+  if [ "$CARCH" == "mips64el" ]; then
+    make ${MAKEFLAGS} vmlinuz modules
+  else
+    make ${MAKEFLAGS} bzImage modules
+  fi
 }
 
 package_linux-libre() {
@@ -115,13 +123,19 @@ package_linux-libre() {
   cd "${srcdir}/linux-${_basekernel}"
 
   KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
 
   # get kernel version
   _kernver="$(make kernelrelease)"
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
-  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}"
+
+  if [ "$CARCH" == "mips64el" ]; then
+    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+  else
+    cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
+  fi
 
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
@@ -140,6 +154,12 @@ package_linux-libre() {
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \
     -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
 
+# mkinitcpio 0.7 relies on bzImage to find the kernel version
+  if [ "$CARCH" == "mips64el" ]; then
+    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|g" \
+        -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset"
+  fi
+
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
@@ -159,6 +179,15 @@ package_linux-libre-headers() {
   conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
   replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers')
 
+  KARCH=x86
+  [ $CARCH = "mips64el" ] && KARCH=mips
+
+# In case of repackaging this is empty
+  if [ -z "${_kernver}" ]; then
+    cd ${srcdir}/linux-$pkgver
+    _kernver="$(make kernelrelease)"
+  fi
+
   mkdir -p "${pkgdir}/lib/modules/${_kernver}"
 
   cd "${pkgdir}/lib/modules/${_kernver}"
@@ -180,13 +209,19 @@ package_linux-libre-headers() {
   done
 
   # copy arch includes for external modules
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86"
-  cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}"
+  cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
 
   # copy files necessary for later builds
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
   cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
 
+  if [ "$CARCH" = "mips64el" ]; then
+    cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+    cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/"
+  fi
+
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
@@ -281,7 +316,12 @@ package_linux-libre-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
+  if [ "$CARCH" = "mips64el" ]; then
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+  else
+    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips
+  fi
 }
 
 package_linux-libre-docs() {
@@ -300,14 +340,15 @@ package_linux-libre-docs() {
   # remove a file already in linux package
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
-<<<<<<< HEAD
-=======
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         'eb37c323f6993d6cc963c61a1f482956'
-         '4e9be096386838d247672963f9af9ea8'
+         '6e0c99536652e7deb71acbadc980b586'
+         'fb12372c5c7bc4e5328b38953616c7a5'
+         '92f62a90c1df8d74704a510d28146c52'
+         '576ba68b171efd4a3333736c30f334ef'
          'a8a3843046926eb7ab81312cd438c5c5'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '52d41fa61e80277ace2b994412a0c856')
->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
+         '4cd79aa147825837dc8bc9f6b736c0a0')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 71783fa50..9aace04bc 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,10 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-<<<<<<< HEAD
-# Linux/i386 3.1.6-1 Kernel Configuration
-=======
 # Linux/i386 3.2.0 Kernel Configuration
->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1297,7 +1293,8 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
 CONFIG_MTD_TESTS=m
 CONFIG_MTD_REDBOOT_PARTS=m
@@ -2269,13 +2266,11 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
-CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2294,7 +2289,10 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -3318,11 +3316,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
+# CONFIG_BCMA is not set
 
 #
 # Multifunction device drivers
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index df37a6f20..42aafc2bb 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.6-1 Kernel Configuration
+# Linux/x86_64 3.2.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -1252,7 +1252,8 @@ CONFIG_SYS_HYPERVISOR=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 CONFIG_REGMAP_SPI=y
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
 CONFIG_MTD=m
 CONFIG_MTD_TESTS=m
 CONFIG_MTD_REDBOOT_PARTS=m
@@ -2151,13 +2152,11 @@ CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
 # CONFIG_ATH6KL_DEBUG is not set
 CONFIG_B43=m
-CONFIG_B43_BCMA=y
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
-CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_PIO=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
@@ -2176,7 +2175,10 @@ CONFIG_B43LEGACY_PIO=y
 CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 # CONFIG_B43LEGACY_DMA_MODE is not set
 # CONFIG_B43LEGACY_PIO_MODE is not set
-# CONFIG_BRCMFMAC is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+# CONFIG_BRCMDBG is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
@@ -3163,11 +3165,7 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Broadcom specific AMBA
 #
-CONFIG_BCMA=m
-CONFIG_BCMA_BLOCKIO=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-CONFIG_BCMA_HOST_PCI=y
-# CONFIG_BCMA_DEBUG is not set
+# CONFIG_BCMA is not set
 
 #
 # Multifunction device drivers
diff --git a/libre/linux-libre/i915-gpu-finish.patch b/libre/linux-libre/i915-gpu-finish.patch
new file mode 100644
index 000000000..5840c9181
--- /dev/null
+++ b/libre/linux-libre/i915-gpu-finish.patch
@@ -0,0 +1,55 @@
+commit 389a55581e30607af0fcde6cdb4e54f189cf46cf
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Tue Nov 29 15:12:16 2011 +0000
+
+    drm/i915: Only clear the GPU domains upon a successful finish
+    
+    By clearing the GPU read domains before waiting upon the buffer, we run
+    the risk of the wait being interrupted and the domains prematurely
+    cleared. The next time we attempt to wait upon the buffer (after
+    userspace handles the signal), we believe that the buffer is idle and so
+    skip the wait.
+    
+    There are a number of bugs across all generations which show signs of an
+    overly haste reuse of active buffers.
+    
+    Such as:
+    
+      https://bugs.freedesktop.org/show_bug.cgi?id=29046
+      https://bugs.freedesktop.org/show_bug.cgi?id=35863
+      https://bugs.freedesktop.org/show_bug.cgi?id=38952
+      https://bugs.freedesktop.org/show_bug.cgi?id=40282
+      https://bugs.freedesktop.org/show_bug.cgi?id=41098
+      https://bugs.freedesktop.org/show_bug.cgi?id=41102
+      https://bugs.freedesktop.org/show_bug.cgi?id=41284
+      https://bugs.freedesktop.org/show_bug.cgi?id=42141
+    
+    A couple of those pre-date i915_gem_object_finish_gpu(), so may be
+    unrelated (such as a wild write from a userspace command buffer), but
+    this does look like a convincing cause for most of those bugs.
+    
+    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+    Cc: stable@kernel.org
+    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+    Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index d560175..036bc58 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
+ 			return ret;
+ 	}
+ 
++	ret = i915_gem_object_wait_rendering(obj);
++	if (ret)
++		return ret;
++
+ 	/* Ensure that we invalidate the GPU's caches and TLBs. */
+ 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
+-
+-	return i915_gem_object_wait_rendering(obj);
++	return 0;
+ }
+ 
+ /**
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index bab05ffce..f08840c94 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,11 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-<<<<<<< HEAD
-KERNEL_VERSION=3.1.6-1-LIBRE
-=======
-KERNEL_VERSION=3.2.0-1-LIBRE
->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c
+KERNEL_VERSION=3.2.1-1-LIBRE
 
 post_install () {
   # updating module dependencies
@@ -49,7 +45,6 @@ post_upgrade() {
 
   if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
-    echo "         You probably just broke your system. Congratulations."
   fi
 
   # updating module dependencies