r3207 - / sarge-proposed-updates sarge-proposed-updates/kernel-2.4 sarge-proposed-updates/kernel-2.4/mips sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/config/mipsel sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches
Thiemo Seufer
ths-guest@costa.debian.org
Sat, 21 May 2005 10:28:50 +0000
Author: ths-guest
Date: 2005-05-21 10:28:49 +0000 (Sat, 21 May 2005)
New Revision: 3207
Added:
sarge-proposed-updates/
sarge-proposed-updates/kernel-2.4/
sarge-proposed-updates/kernel-2.4/mips/
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/12_cobalt-qube1-serial.dpatch
Modified:
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/config/mipsel/r5k-cobalt
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/changelog
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/control
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/00list
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/06_ptrace-fix.dpatch
sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/10_cobalt-patch.dpatch
Log:
Sarge proposed update tree, currently only for mips.
Copied: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips (from rev 3203, sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips)
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/config/mipsel/r5k-cobalt
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/config/mipsel/r5k-cobalt 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/config/mipsel/r5k-cobalt 2005-05-21 10:28:49 UTC (rev 3207)
@@ -412,7 +412,7 @@
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_PCI_AUTO is not set
# CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_PCI_WIP is not set
@@ -445,7 +445,7 @@
# CONFIG_BLK_DEV_TRM290 is not set
CONFIG_BLK_DEV_VIA82CXXX=y
# CONFIG_IDE_CHIPSETS is not set
-CONFIG_IDEDMA_AUTO=y
+# CONFIG_IDEDMA_AUTO is not set
# CONFIG_IDEDMA_IVB is not set
# CONFIG_DMA_NONPCI is not set
# CONFIG_BLK_DEV_ATARAID is not set
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/changelog
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/changelog 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/changelog 2005-05-21 10:28:49 UTC (rev 3207)
@@ -1,8 +1,14 @@
-kernel-patch-2.4.27-mips (2.4.27-8sarge1.040815-1) testing-security-UNRELEASED; urgency=low
+kernel-patch-2.4.27-mips (2.4.27-10.040815-0sarge1) testing-UNRELEASED; urgency=low
- * Update to debian kernel source 2.4.27-8sarge1 for security fixes.
+ * Update to debian kernel source 2.4.27-10 for security fixes.
See kernel source changelog for details.
* Tighten build dependency to match the exact source version.
+ * Fix crash for serial-less Cobalt Qube1, 12_cobalt-qube1-serial.dpatch.
+ * Fix Cobalt PCI initialization.
+ * Disable CONFIG_IDEDMA_PCI_AUTO, CONFIG_IDEDMA_AUTO again for Cobalt
+ because of crashes under I/O load.
+ * Relicense the elf2ecoff manpage to GPL 2.
+ * Fix broken ptrace patch (Closes: #299204).
-- Thiemo Seufer <ths@debian.org> Thu, 19 May 2005 11:46:06 +0200
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/control
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/control 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/control 2005-05-21 10:28:49 UTC (rev 3207)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Uploaders: Guido Guenther <agx@debian.org>, Karsten Merker <merker@debian.org>, Thiemo Seufer <ths@debian.org>
-Build-Depends: kernel-source-2.4.27 (=2.4.27-8sarge1), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
+Build-Depends: kernel-source-2.4.27 (=2.4.27-10), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
Standards-Version: 3.6.1
Package: kernel-headers-2.4.27
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/00list
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/00list 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/00list 2005-05-21 10:28:49 UTC (rev 3207)
@@ -6,6 +6,7 @@
07_mips32-tlb.dpatch
10_cobalt-patch.dpatch
11_cobalt-tulip.dpatch
+12_cobalt-qube1-serial.dpatch
20_sb1-mipsrtc.dpatch
21_sb-duart.dpatch
22_swarm-pcmcia.dpatch
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/06_ptrace-fix.dpatch
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/06_ptrace-fix.dpatch 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/06_ptrace-fix.dpatch 2005-05-21 10:28:49 UTC (rev 3207)
@@ -3,6 +3,7 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix exploitable ptrace syscall handling, backport from 2.4.28.
+## DP: This backport broke strace, changed 2005-03-12.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
@@ -35,39 +36,13 @@
trace_a_syscall:
SAVE_STATIC
- sw t2, PT_R1(sp)
-+ sw t2, PT_SCRATCH0(sp)
++ move s0, t2
jal syscall_trace
- lw t2, PT_R1(sp)
-+ lw t2, PT_SCRATCH0(sp)
++ move t2, s0
lw a0, PT_R4(sp) # Restore argument registers
lw a1, PT_R5(sp)
-Index: arch/mips/tools/offset.c
-===================================================================
-RCS file: /home/cvs/linux/arch/mips/tools/Attic/offset.c,v
-retrieving revision 1.16.4.11
-retrieving revision 1.16.4.12
-diff -u -p -r1.16.4.11 -r1.16.4.12
---- arch/mips/tools/offset.c 17 Oct 2003 10:41:11 -0000 1.16.4.11
-+++ arch/mips/tools/offset.c 25 Nov 2004 09:43:59 -0000 1.16.4.12
-@@ -12,6 +12,7 @@
- #include <linux/types.h>
- #include <linux/sched.h>
- #include <linux/mm.h>
-+#include <linux/signal.h>
-
- #include <asm/ptrace.h>
- #include <asm/processor.h>
-@@ -36,6 +37,9 @@ linefeed;
- void output_ptreg_defines(void)
- {
- text("/* MIPS pt_regs offsets. */");
-+ offset("#define PT_SCRATCH0 ", struct pt_regs, pad0[4]);
-+ offset("#define PT_SCRATCH1 ", struct pt_regs, pad0[5]);
-+
- offset("#define PT_R0 ", struct pt_regs, regs[0]);
- offset("#define PT_R1 ", struct pt_regs, regs[1]);
- offset("#define PT_R2 ", struct pt_regs, regs[2]);
Index: arch/mips64/kernel/scall_64.S
===================================================================
RCS file: /home/cvs/linux/arch/mips64/kernel/Attic/scall_64.S,v
@@ -81,10 +56,10 @@
trace_a_syscall:
SAVE_STATIC
- sd t2,PT_R1(sp)
-+ sd t2, PT_SCRATCH0(sp)
++ move s0, t2
jal syscall_trace
- ld t2,PT_R1(sp)
-+ ld t2, PT_SCRATCH0(sp)
++ move t2, s0
ld a0, PT_R4(sp) # Restore argument registers
ld a1, PT_R5(sp)
@@ -101,10 +76,10 @@
trace_a_syscall:
SAVE_STATIC
- sd t2,PT_R1(sp)
-+ sd t2, PT_SCRATCH0(sp)
++ move s0, t2
jal syscall_trace
- ld t2,PT_R1(sp)
-+ ld t2, PT_SCRATCH0(sp)
++ move t2, s0
ld a0, PT_R4(sp) # Restore argument registers
ld a1, PT_R5(sp)
@@ -121,10 +96,10 @@
sd a7, PT_R11(sp)
- sd t2,PT_R1(sp)
-+ sd t2, PT_SCRATCH0(sp)
++ move s0, t2
jal syscall_trace
- ld t2,PT_R1(sp)
-+ ld t2, PT_SCRATCH0(sp)
++ move t2, s0
ld a0, PT_R4(sp) # Restore argument registers
ld a1, PT_R5(sp)
Modified: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/10_cobalt-patch.dpatch
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/10_cobalt-patch.dpatch 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/10_cobalt-patch.dpatch 2005-05-21 10:28:49 UTC (rev 3207)
@@ -26,40 +26,34 @@
diff -urN linux.cvs/arch/mips/cobalt/pci.c linux.pdh/arch/mips/cobalt/pci.c
--- linux.cvs/arch/mips/cobalt/pci.c 2003-07-05 14:17:03.000000000 +0100
+++ linux.pdh/arch/mips/cobalt/pci.c 2004-04-11 16:27:59.000000000 +0100
-@@ -211,7 +211,14 @@
- pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);
- pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 7);
-
-- /* On all machines prior to Q2, we had the STOP line disconnected
-+ /* The code described by the comment below has been removed
-+ * as it causes bus mastering by the Ethernet controllers
-+ * to break under any kind of network load. We always set
-+ * the retry timeouts to their maximum.
-+ *
-+ * --x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--x--
-+ *
-+ * On all machines prior to Q2, we had the STOP line disconnected
- * from Galileo to VIA on PCI. The new Galileo does not function
- * correctly unless we have it connected.
- *
-@@ -220,10 +227,16 @@
- */
- pci_read_config_word(dev, PCI_REVISION_ID, &galileo_id);
- galileo_id &= 0xff; /* mask off class info */
-+
-+ printk("Galileo ID: %u\n", galileo_id);
-+
-+#if 0
- if (galileo_id >= 0x10) {
- /* New Galileo, assumes PCI stop line to VIA is connected. */
- GALILEO_OUTL(0x4020, GT_PCI0_TOR_OFS);
-- } else if (galileo_id == 0x1 || galileo_id == 0x2) {
-+ } else if (galileo_id == 0x1 || galileo_id == 0x2)
-+#endif
-+ {
- signed int timeo;
+@@ -220,7 +227,14 @@
/* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */
timeo = GALILEO_INL(GT_PCI0_TOR_OFS);
+ /* Old Galileo, assumes PCI STOP line to VIA is disconnected. */
+- GALILEO_OUTL(0xffff, GT_PCI0_TOR_OFS);
++ GALILEO_OUTL(
++ (0xff << 16) | /* retry count */
++ (0xff << 8) | /* timeout 1 */
++ 0xff, /* timeout 0 */
++ GT_PCI0_TOR_OFS);
++
++ /* enable PCI retry exceeded interrupt */
++ GALILEO_OUTL(GALILEO_INTR_RETRY_CTR | GALILEO_INL(GT_INTRMASK_OFS), GT_INTRMASK_OFS);
+ }
+ }
+
+Index: linux/include/asm-mips/cobalt/cobalt.h
+===================================================================
+--- linux.orig/include/asm-mips/cobalt/cobalt.h 2005-04-10 13:16:12.000000000 +0100
++++ linux/include/asm-mips/cobalt/cobalt.h 2005-04-10 13:16:12.000000000 +0100
+@@ -89,6 +89,7 @@
+ #define GALILEO_OUTL(val, port) outl(val, GALILEO_REG(port))
+
+ #define GALILEO_T0EXP 0x0100
++#define GALILEO_INTR_RETRY_CTR (1 << 20)
+ #define GALILEO_ENTC0 0x01
+ #define GALILEO_SELTC0 0x02
+
diff -urN linux.cvs/arch/mips/cobalt/setup.c linux.pdh/arch/mips/cobalt/setup.c
--- linux.cvs/arch/mips/cobalt/setup.c 2003-07-05 14:17:03.000000000 +0100
+++ linux.pdh/arch/mips/cobalt/setup.c 2004-04-11 17:50:11.000000000 +0100
Added: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/12_cobalt-qube1-serial.dpatch
===================================================================
--- sarge-security/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/12_cobalt-qube1-serial.dpatch 2005-05-20 23:45:33 UTC (rev 3203)
+++ sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/12_cobalt-qube1-serial.dpatch 2005-05-21 10:28:49 UTC (rev 3207)
@@ -0,0 +1,183 @@
+#! /bin/sh -e
+## 12_cobalt-qube1-serial.dpatch by Peter Horton <pdh@colonel-panic.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add proper detection for serial console, this fixes a crash for
+## DP: Qube1 without serials.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+Index: kernel-source-2.4.27/include/asm-mips/serial.h
+===================================================================
+--- kernel-source-2.4.27.orig/include/asm-mips/serial.h 2005-05-01 15:26:34.000000000 +0100
++++ kernel-source-2.4.27/include/asm-mips/serial.h 2005-05-01 15:56:02.000000000 +0100
+@@ -97,16 +97,6 @@
+ #define SEAD_SERIAL_PORT_DEFNS
+ #endif
+
+-#ifdef CONFIG_MIPS_COBALT
+-#include <asm/cobalt/cobalt.h>
+-#define COBALT_BASE_BAUD (18432000 / 16)
+-#define COBALT_SERIAL_PORT_DEFNS \
+- /* UART CLK PORT IRQ FLAGS */ \
+- { 0, COBALT_BASE_BAUD, 0xc800000, COBALT_SERIAL_IRQ, STD_COM_FLAGS }, /* ttyS0 */
+-#else
+-#define COBALT_SERIAL_PORT_DEFNS
+-#endif
+-
+ /*
+ * Both Galileo boards have the same UART mappings.
+ */
+@@ -452,7 +442,6 @@
+ #define SERIAL_PORT_DFNS \
+ ATLAS_SERIAL_PORT_DEFNS \
+ AU1000_SERIAL_PORT_DEFNS \
+- COBALT_SERIAL_PORT_DEFNS \
+ DDB5477_SERIAL_PORT_DEFNS \
+ EV96100_SERIAL_PORT_DEFNS \
+ EXTRA_SERIAL_PORT_DEFNS \
+Index: kernel-source-2.4.27/arch/mips/cobalt/setup.c
+===================================================================
+--- kernel-source-2.4.27.orig/arch/mips/cobalt/setup.c 2005-05-01 15:26:34.000000000 +0100
++++ kernel-source-2.4.27/arch/mips/cobalt/setup.c 2005-05-01 16:01:28.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <linux/mc146818rtc.h>
+ #include <linux/init.h>
+ #include <linux/ide.h>
++#include <linux/serial.h>
+
+ #include <asm/bootinfo.h>
+ #include <asm/time.h>
+@@ -24,6 +25,7 @@
+ #include <asm/processor.h>
+ #include <asm/reboot.h>
+ #include <asm/gt64120/gt64120.h>
++#include <asm/serial.h>
+
+ #include <asm/cobalt/cobalt.h>
+
+@@ -84,6 +86,32 @@
+ GALILEO_OUTL(0x100, GT_INTRMASK_OFS);
+ }
+
++static void __init cobalt_probe_unit(void)
++{
++ struct pci_dev dev;
++
++ /* Read the cobalt id register out of the PCI config space */
++ dev.devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
++ PCI_CFG_SET(&dev, (VIA_COBALT_BRD_ID_REG & ~0x3));
++ cobalt_board_id = GALILEO_INL(GT_PCI0_CFGDATA_OFS) >> ((VIA_COBALT_BRD_ID_REG & 3) * 8);
++ cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id);
++
++ printk("Cobalt Board ID: %d\n", cobalt_board_id);
++}
++
++static void __init cobalt_console_setup(void)
++{
++ struct serial_struct cons;
++
++ memset(&cons, 0, sizeof(cons));
++ cons.irq = COBALT_SERIAL_IRQ;
++ cons.flags = STD_COM_FLAGS;
++ cons.io_type = SERIAL_IO_MEM;
++ cons.baud_base = 18432000 / 16;
++ cons.iomem_base = KSEG1ADDR(0x1c800000);
++
++ register_serial(&cons);
++}
+
+ void __init cobalt_setup(void)
+ {
+@@ -101,13 +129,20 @@
+
+ set_io_port_base(KSEG1ADDR(0x10000000));
+
+- /*
+- * This is a prom style console. We just poke at the
+- * UART to make it talk.
+- * Only use this console if you really screw up and can't
+- * get to the stage of setting up a real serial console.
+- */
+- /*ns16550_setup_console();*/
++ cobalt_probe_unit();
++
++ if (cobalt_board_id != COBALT_BRD_ID_QUBE1) {
++
++ /*
++ * This is a prom style console. We just poke at the
++ * UART to make it talk.
++ * Only use this console if you really screw up and can't
++ * get to the stage of setting up a real serial console.
++ */
++ /*ns16550_setup_console();*/
++
++ cobalt_console_setup();
++ }
+ }
+
+ #ifdef CONFIG_BLK_DEV_INITRD
+Index: kernel-source-2.4.27/arch/mips/cobalt/pci.c
+===================================================================
+--- kernel-source-2.4.27.orig/arch/mips/cobalt/pci.c 2005-05-01 12:43:42.000000000 +0100
++++ kernel-source-2.4.27/arch/mips/cobalt/pci.c 2005-05-01 15:54:44.000000000 +0100
+@@ -283,10 +283,6 @@
+ return -1; /* NOT ok device number */
+ }
+
+-#define PCI_CFG_SET(dev,where) \
+- GALILEO_OUTL((0x80000000 | (((dev)->devfn) << 8) | \
+- (where)), GT_PCI0_CFGADDR_OFS)
+-
+ static int qube_pci_read_config_dword (struct pci_dev *dev,
+ int where,
+ u32 *val)
+@@ -391,18 +387,8 @@
+
+ void __init pcibios_init(void)
+ {
+- struct pci_dev dev;
+-
+ printk("PCI: Probing PCI hardware\n");
+
+- /* Read the cobalt id register out of the PCI config space */
+- dev.devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
+- PCI_CFG_SET(&dev, (VIA_COBALT_BRD_ID_REG & ~0x3));
+- cobalt_board_id = GALILEO_INL(GT_PCI0_CFGDATA_OFS) >> ((VIA_COBALT_BRD_ID_REG & 3) * 8);
+- cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id);
+-
+- printk("Cobalt Board ID: %d\n", cobalt_board_id);
+-
+ ioport_resource.start = 0x00000000;
+ ioport_resource.end = 0x0fffffff;
+
+Index: kernel-source-2.4.27/include/asm-mips/cobalt/cobalt.h
+===================================================================
+--- kernel-source-2.4.27.orig/include/asm-mips/cobalt/cobalt.h 2005-05-01 15:55:33.000000000 +0100
++++ kernel-source-2.4.27/include/asm-mips/cobalt/cobalt.h 2005-05-01 15:55:40.000000000 +0100
+@@ -93,4 +93,8 @@
+ #define GALILEO_ENTC0 0x01
+ #define GALILEO_SELTC0 0x02
+
++#define PCI_CFG_SET(dev,where) \
++ GALILEO_OUTL((0x80000000 | (((dev)->devfn) << 8) | \
++ (where)), GT_PCI0_CFGADDR_OFS)
++
+ #endif /* __ASM_MIPS_COBALT_H */
+
Property changes on: sarge-proposed-updates/kernel-2.4/mips/kernel-patch-2.4.27-mips/debian/patches/12_cobalt-qube1-serial.dpatch
___________________________________________________________________
Name: svn:executable
+ *