r1408 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[luther@haydn.debian.org]

Author: luther
Date: 2004-08-27 16:06:45 -0600 (Fri, 27 Aug 2004)
New Revision: 1408

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5
Log:
Really clear the g4-errata BTIC bit, and not just toggle it.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-27 21:25:14 UTC (rev 1407)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-27 22:06:45 UTC (rev 1408)
@@ -1,11 +1,14 @@
 kernel-source-2.6.8 (2.6.8-5) UNRELEASED; urgency=high
 
+  * Fixed g4-errata BTIC patch to really clear the BTIC bit, and not just
+    toggle it. (Sven Luther)
+
   * Patches by the infintely wise and awesome David S. Miller:
     - sparc64-sunsab-fix.dpatch: Fix the infamous serial output
       bug causing every other character in kernel messages to be omitted.
     - sparc64-syslog-register.dpatch: Fix a critical typo that
       caused the 32-bit syslog wrapper to halt the entire system.
-    
+
   * sparc32: Export enough ksyms for our modules to work.
 
   * Drop patch modular-xfrm4_tunnel, which caused far more trouble than it
@@ -14,9 +17,9 @@
   * Switch to the 2.4.x patch-series system. Drop build-dependency on dpatch.
 
   * Add myself to Uploaders.
+  
+ -- Sven Luther <luther@debian.org>  Sat, 28 Aug 2004 00:01:15 +0200
 
- -- Joshua Kwan <joshk@triplehelix.org>  Fri, 27 Aug 2004 06:14:43 +0000
-
 kernel-source-2.6.8 (2.6.8-4) unstable; urgency=high
 
   * Added patch by Alex Clausen to stop spurious mouse button events

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch	2004-08-27 21:25:14 UTC (rev 1407)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-g4-errata-2.dpatch	2004-08-27 22:06:45 UTC (rev 1408)
@@ -0,0 +1,27 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Clears the BTIC bit if it was previously set by the firmware, but is broken in the CPUs.
+## DP: Patch author: Sven Luther <luther@debian.org>
+## DP: Upstream status: reviewed and submited by benh
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.8.orig/arch/ppc/kernel/cpu_setup_6xx.S	2004-08-14 07:36:18.000000000 +0200
++++ kernel-source-2.6.8/arch/ppc/kernel/cpu_setup_6xx.S	2004-08-26 11:24:12.970564536 +0200
+@@ -218,10 +218,11 @@
+ 
+ 	/* All of the bits we have to set.....
+ 	 */
+-	ori	r11,r11,HID0_SGE | HID0_FOLD | HID0_BHTE | HID0_LRSTK
++	ori	r11,r11,HID0_SGE | HID0_FOLD | HID0_BHTE | HID0_BTIC | HID0_LRSTK
+ BEGIN_FTR_SECTION
+-	ori	r11,r11,HID0_BTIC
+-END_FTR_SECTION_IFCLR(CPU_FTR_NO_BTIC)
++	li	r3,HID0_BTIC
++	andc	r11,r11,r3
++END_FTR_SECTION_IFSET(CPU_FTR_NO_BTIC)
+ BEGIN_FTR_SECTION
+ 	oris	r11,r11,HID0_DPM@h	/* enable dynamic power mgmt */
+ END_FTR_SECTION_IFCLR(CPU_FTR_NO_DPM)

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5	2004-08-27 21:25:14 UTC (rev 1407)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-5	2004-08-27 22:06:45 UTC (rev 1408)
@@ -2,3 +2,5 @@
 + sparc64-syslog-register.dpatch
 + sparc32-export-more-ksyms.dpatch
 - modular-xfrm_tunnel.dpatch
+- powerpc-g4-errata.dpatch
++ powerpc-g4-errata-2.dpatch