[kernel] r9678 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips

[Martin Michlmayr]

Author: tbm
Date: Mon Oct 29 16:10:14 2007
New Revision: 9678

Log:
Add IP22 fixes from Thomas Bogendoerfer


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-disable-early-printk.patch
   dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-argument-order.patch
   dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-second-hpc-check.patch
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Oct 29 16:10:14 2007
@@ -1,3 +1,13 @@
+linux-2.6 (2.6.22-6) UNRELEASED; urgency=low
+
+  [ Martin Michlmayr ]
+  * [mips] Add IP22 (SGI Indy) patches from Thomas Bogendoerfer:
+    - Disable EARLY PRINTK because it breaks serial.
+    - fix wrong argument order.
+    - wrong check for second HPC.  Closes: #448488
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Mon, 29 Oct 2007 17:09:11 +0100
+
 linux-2.6 (2.6.22-5) unstable; urgency=low
 
   [ maximilian attems ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-disable-early-printk.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-disable-early-printk.patch	Mon Oct 29 16:10:14 2007
@@ -0,0 +1,27 @@
+From:	tsbogend at alpha.franken.de (Thomas Bogendoerfer)
+Date:	Tue, 11 Sep 2007 12:44:59 +0200
+To:	linux-mips at linux-mips.org
+Subject: [PATCH] IP22: Disable EARLY PRINTK, because it breaks serial console
+
+Disable EARLY PRINTK, because it breaks serial console
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+ arch/mips/Kconfig |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
+index 3b807b4..1f0502d 100644
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -334,7 +334,6 @@ config SGI_IP22
+ 	select SWAP_IO_SPACE
+ 	select SYS_HAS_CPU_R4X00
+ 	select SYS_HAS_CPU_R5000
+-	select SYS_HAS_EARLY_PRINTK
+ 	select SYS_SUPPORTS_32BIT_KERNEL
+ 	select SYS_SUPPORTS_64BIT_KERNEL
+ 	select SYS_SUPPORTS_BIG_ENDIAN
+-- 
+1.4.4.4
+

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-argument-order.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-argument-order.patch	Mon Oct 29 16:10:14 2007
@@ -0,0 +1,32 @@
+From:	tsbogend at alpha.franken.de (Thomas Bogendoerfer)
+Date:	Tue, 11 Sep 2007 12:43:55 +0200
+To:	linux-mips at linux-mips.org
+Cc:	ralf at linux-mips.org
+Subject: [PATCH] IP22: fix wrong argument order
+
+fix wrong argument order; this is just a minimal fix for the half baked
+reda7b/writeb() conversation
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+ arch/mips/sgi-ip22/ip22-time.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
+index 8e88a44..de3d018 100644
+--- a/arch/mips/sgi-ip22/ip22-time.c
++++ b/arch/mips/sgi-ip22/ip22-time.c
+@@ -114,8 +114,8 @@ static unsigned long dosample(void)
+ 	} while (msb);
+ 
+ 	/* Stop the counter. */
+-	writeb(sgint->tcword, (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL |
+-			       SGINT_TCWORD_MSWST));
++	writeb(SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | SGINT_TCWORD_MSWST,
++	       &sgint->tcword);
+ 	/*
+ 	 * Return the difference, this is how far the r4k counter increments
+ 	 * for every 1/HZ seconds. We round off the nearest 1 MHz of master
+-- 
+1.4.4.4
+

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-second-hpc-check.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/ip22-fix-second-hpc-check.patch	Mon Oct 29 16:10:14 2007
@@ -0,0 +1,32 @@
+From:	tsbogend at alpha.franken.de (Thomas Bogendoerfer)
+Date:	Tue, 11 Sep 2007 12:46:03 +0200
+To:	linux-mips at linux-mips.org
+Cc:	ralf at linux-mips.org
+Subject: [PATCH] IP22 wrong check for second HPC
+
+Wrong check for the second hpc on fullhouse machines, caused DBEs on
+SGI Indys
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+ arch/mips/sgi-ip22/ip22-platform.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
+index 78b608d..28ffec8 100644
+--- a/arch/mips/sgi-ip22/ip22-platform.c
++++ b/arch/mips/sgi-ip22/ip22-platform.c
+@@ -150,8 +150,8 @@ static int __init sgiseeq_devinit(void)
+ 		return res;
+ 
+ 	/* Second HPC is missing? */
+-	if (ip22_is_fullhouse() ||
+-	    !get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
++	if (!ip22_is_fullhouse() ||
++	    get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
+ 		return 0;
+ 
+ 	sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 |
+-- 
+1.4.4.4
+