r2999 - in trunk/kernel/source: kernel-source-2.6.10-2.6.10/debian kernel-source-2.6.10-2.6.10/debian/patches kernel-source-2.6.10-2.6.10/debian/patches/series kernel-source-2.6.11-2.6.11/debian kernel-source-2.6.11-2.6.11/debian/patches kernel-source-2.6.11-2.6.11/debian/patches/series kernel-source-2.6.8-2.6.8/debian kernel-source-2.6.8-2.6.8/debian/patches kernel-source-2.6.8-2.6.8/debian/patches/series
Jurij Smakov
jurij-guest@costa.debian.org
Sat, 23 Apr 2005 22:26:27 +0000
Author: jurij-guest
Date: 2005-04-23 22:26:25 +0000 (Sat, 23 Apr 2005)
New Revision: 2999
Added:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sunsu-init-2.6.10.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-sunsu-init-2.6.11.patch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsu-init.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-7
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4
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-16
Log:
Added sparc64-sunsu-init patch by David Miller, fixing
the initialization of the sunsu serial driver (so that
the mouse is detected properly), to all 2.6 branches.
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-04-23 22:26:25 UTC (rev 2999)
@@ -6,10 +6,17 @@
* [powerpc] replaced pegasos marvell gigabit ethernet driver by the backported
version (Sven Luther)
+
* [sparc] Added sparc-sunsab-serial-lockup.dpatch to eliminate the serial
console lockup when booting the kernel over serial console on a machine
with sunsab serial controller (Jurij Smakov).
+ * sparc64-sunsu-init-2.6.10.dpatch:
+ [sparc64] Patch by David Miller to fix the initialization of the
+ sunsu serial driver. Mouse connected to the serial port is now
+ detected properly. (Jurij Smakov)
+ Ref: http://lists.debian.org/debian-sparc/2005/04/msg00203.html
+
-- Sven Luther <luther@debian.org> Wed, 6 Apr 2005 01:24:00 -0400
kernel-source-2.6.10 (2.6.10-6) unstable; urgency=low
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-7
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-7 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-7 2005-04-23 22:26:25 UTC (rev 2999)
@@ -3,3 +3,4 @@
+ powerpc-mv643xx-eth-pegasos.dpatch
+ sparc-sunsab-serial-lockup.dpatch
+ sparc64-sigpoll-2.6.10.dpatch
++ sparc64-sunsu-init-2.6.10.dpatch
Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sunsu-init-2.6.10.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sunsu-init-2.6.10.dpatch 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sunsu-init-2.6.10.dpatch 2005-04-23 22:26:25 UTC (rev 2999)
@@ -0,0 +1,63 @@
+# From davem@davemloft.net Fri Apr 22 09:58:54 2005
+# Date: Thu, 21 Apr 2005 22:08:34 -0700
+# From: David S. Miller <davem@davemloft.net>
+# To: Tomas Cernaj <tcernaj@gmx.de>
+# Cc: debian-sparc@lists.debian.org, sparclinux@vger.kernel.org
+# Subject: Re: Weird Mouse Behaviour with 2.6
+# Resent-Date: Fri, 22 Apr 2005 00:31:44 -0500 (CDT)
+# Resent-From: debian-sparc@lists.debian.org
+#
+#
+# Ok, let's kill this bug already :-)
+#
+# We were neglecting to invoke sunsu_change_speed() when first
+# setting up the keyboard and mouse ports. That's why things
+# were not working.
+#
+# This should fix it and I'll push this upsteam.
+#
+# [SPARC64]: In sunsu driver, make sure to fully init chip for kbd/ms
+#
+# We were forgetting to call sunsu_change_speed(). The reason
+# that replugging in the mouse cable "fixes things" is that
+# causes a BREAK interrupt which in turn caused a call to
+# sunsu_change_speed() which would get the chip setup properly.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# Adapted for 2.6.10 by Jurij Smakov.
+#
+--- a/drivers/serial/sunsu.c 2004-12-24 16:34:26.000000000 -0500
++++ b/drivers/serial/sunsu.c 2005-04-23 11:49:19.918097352 -0400
+@@ -1286,15 +1286,20 @@
+ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)
+ {
+ struct serio *serio;
++ int quot, baud;
+
+ up->port.line = channel;
+ up->port.type = PORT_UNKNOWN;
+ up->port.uartclk = (SU_BASE_BAUD * 16);
+
+- if (up->su_type == SU_PORT_KBD)
++ if (up->su_type == SU_PORT_KBD) {
+ up->cflag = B1200 | CS8 | CLOCAL | CREAD;
+- else
++ baud = 1200;
++ } else {
+ up->cflag = B4800 | CS8 | CLOCAL | CREAD;
++ baud = 4800;
++ }
++ quot = up->port.uartclk / (16 * baud);
+
+ sunsu_autoconfig(up);
+ if (up->port.type == PORT_UNKNOWN)
+@@ -1334,6 +1339,8 @@
+ }
+ #endif
+
++ sunsu_change_speed(&up->port, up->cflag, 0, quot);
++
+ sunsu_startup(&up->port);
+ return 0;
+ }
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-04-23 22:26:25 UTC (rev 2999)
@@ -1,9 +1,5 @@
kernel-source-2.6.11 (2.6.11-4) UNRELEASED; urgency=low
- * sparc64-sigpoll-2.6.11.patch:
- [sparc64] Correctly fill out the siginfo_t fields upon delivery
- of SIGPOLL and friends (Jurij Smakov)
-
* [sparc64] Replaced sparc-sunsab-serial-lockup.patch by a more
official version approved by upstream (sunsab-uart-update-timeout.patch)
which appears to perform marginally better (Jurij Smakov).
@@ -14,6 +10,16 @@
in the sparc64 compat layer (Jurij Smakov).
Ref: http://marc.theaimsgroup.com/?l=linux-sparc&m=111273516700128&w=2
+ * sparc64-sigpoll-2.6.11.patch:
+ [sparc64] Correctly fill out the siginfo_t fields upon delivery
+ of SIGPOLL and friends (Jurij Smakov)
+
+ * sparc64-sunsu-init-2.6.11.patch:
+ [sparc64] Patch by David Miller to fix the initialization of the
+ sunsu serial driver. Mouse connected to the serial port is now
+ detected properly. (Jurij Smakov)
+ Ref: http://lists.debian.org/debian-sparc/2005/04/msg00203.html
+
-- Jurij Smakov <jurij@wooyd.org> Mon, 11 Apr 2005 22:17:01 -0400
kernel-source-2.6.11 (2.6.11-3) unstable; urgency=low
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4 2005-04-23 22:26:25 UTC (rev 2999)
@@ -2,3 +2,4 @@
+ sunsab-uart-update-timeout.patch
+ sparc64-compat-nanoseconds.patch
+ sparc64-sigpoll-2.6.11.patch
++ sparc64-sunsu-init-2.6.11.patch
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-sunsu-init-2.6.11.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-sunsu-init-2.6.11.patch 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-sunsu-init-2.6.11.patch 2005-04-23 22:26:25 UTC (rev 2999)
@@ -0,0 +1,63 @@
+# From davem@davemloft.net Fri Apr 22 09:58:54 2005
+# Date: Thu, 21 Apr 2005 22:08:34 -0700
+# From: David S. Miller <davem@davemloft.net>
+# To: Tomas Cernaj <tcernaj@gmx.de>
+# Cc: debian-sparc@lists.debian.org, sparclinux@vger.kernel.org
+# Subject: Re: Weird Mouse Behaviour with 2.6
+# Resent-Date: Fri, 22 Apr 2005 00:31:44 -0500 (CDT)
+# Resent-From: debian-sparc@lists.debian.org
+#
+#
+# Ok, let's kill this bug already :-)
+#
+# We were neglecting to invoke sunsu_change_speed() when first
+# setting up the keyboard and mouse ports. That's why things
+# were not working.
+#
+# This should fix it and I'll push this upsteam.
+#
+# [SPARC64]: In sunsu driver, make sure to fully init chip for kbd/ms
+#
+# We were forgetting to call sunsu_change_speed(). The reason
+# that replugging in the mouse cable "fixes things" is that
+# causes a BREAK interrupt which in turn caused a call to
+# sunsu_change_speed() which would get the chip setup properly.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+--- a/drivers/serial/sunsu.c 2005-03-02 02:37:49.000000000 -0500
++++ b/drivers/serial/sunsu.c 2005-04-23 11:54:16.000000000 -0400
+@@ -1285,6 +1285,7 @@
+
+ static int __init sunsu_kbd_ms_init(struct uart_sunsu_port *up, int channel)
+ {
++ int quot, baud;
+ #ifdef CONFIG_SERIO
+ struct serio *serio;
+ #endif
+@@ -1293,10 +1294,14 @@
+ up->port.type = PORT_UNKNOWN;
+ up->port.uartclk = (SU_BASE_BAUD * 16);
+
+- if (up->su_type == SU_PORT_KBD)
++ if (up->su_type == SU_PORT_KBD) {
+ up->cflag = B1200 | CS8 | CLOCAL | CREAD;
+- else
++ baud = 1200;
++ } else {
+ up->cflag = B4800 | CS8 | CLOCAL | CREAD;
++ baud = 4800;
++ }
++ quot = up->port.uartclk / (16 * baud);
+
+ sunsu_autoconfig(up);
+ if (up->port.type == PORT_UNKNOWN)
+@@ -1336,6 +1341,8 @@
+ }
+ #endif
+
++ sunsu_change_speed(&up->port, up->cflag, 0, quot);
++
+ sunsu_startup(&up->port);
+ return 0;
+ }
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 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog 2005-04-23 22:26:25 UTC (rev 2999)
@@ -127,6 +127,13 @@
[CAN-2004-0790] Just silently ignore ICMP Source Quench messages.
(Simon Horman) (See: #305655)
+ * sparc64-sunsu-init.dpatch:
+ [sparc64] Patch by David Miller to fix the initialization of the
+ sunsu serial driver. Mouse connected to the serial port is now
+ detected properly. Thanks to Frans Pop for testing. (Jurij Smakov)
+ (closes: #295725)
+ Ref: http://lists.debian.org/debian-sparc/2005/04/msg00203.html
+
-- Simon Horman <horms@debian.org> Wed, 13 Apr 2005 17:23:38 +0900
kernel-source-2.6.8 (2.6.8-15) unstable; urgency=high
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-16 2005-04-23 22:26:25 UTC (rev 2999)
@@ -29,3 +29,4 @@
+ sparc64-sigpoll-2.6.8.dpatch
+ fs-jdb-slow-leak.dpatch
+ net-ipv4-icmp-quench.dpatch
++ sparc64-sunsu-init.dpatch
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsu-init.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsu-init.dpatch 2005-04-23 21:49:44 UTC (rev 2998)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsu-init.dpatch 2005-04-23 22:26:25 UTC (rev 2999)
@@ -0,0 +1,65 @@
+# From davem@davemloft.net Fri Apr 22 09:58:54 2005
+# Date: Thu, 21 Apr 2005 22:08:34 -0700
+# From: David S. Miller <davem@davemloft.net>
+# To: Tomas Cernaj <tcernaj@gmx.de>
+# Cc: debian-sparc@lists.debian.org, sparclinux@vger.kernel.org
+# Subject: Re: Weird Mouse Behaviour with 2.6
+# Resent-Date: Fri, 22 Apr 2005 00:31:44 -0500 (CDT)
+# Resent-From: debian-sparc@lists.debian.org
+#
+#
+# Ok, let's kill this bug already :-)
+#
+# We were neglecting to invoke sunsu_change_speed() when first
+# setting up the keyboard and mouse ports. That's why things
+# were not working.
+#
+# This should fix it and I'll push this upsteam.
+#
+# [SPARC64]: In sunsu driver, make sure to fully init chip for kbd/ms
+#
+# We were forgetting to call sunsu_change_speed(). The reason
+# that replugging in the mouse cable "fixes things" is that
+# causes a BREAK interrupt which in turn caused a call to
+# sunsu_change_speed() which would get the chip setup properly.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# Adopted for 2.6.8 and tested by Frans Pop and Jurij Smakov.
+#
+--- a/drivers/serial/sunsu.c 2004-08-14 01:36:32.000000000 -0400
++++ b/drivers/serial/sunsu.c 2005-04-22 21:00:47.000000000 -0400
+@@ -1287,6 +1287,7 @@
+ static int __init sunsu_kbd_ms_init(void)
+ {
+ struct uart_sunsu_port *up;
++ int quot, baud;
+ int i;
+
+ for (i = 0, up = sunsu_ports; i < 2; i++, up++) {
+@@ -1294,10 +1295,14 @@
+ up->port.type = PORT_UNKNOWN;
+ up->port.uartclk = (SU_BASE_BAUD * 16);
+
+- if (up->su_type == SU_PORT_KBD)
++ if (up->su_type == SU_PORT_KBD) {
+ up->cflag = B1200 | CS8 | CLOCAL | CREAD;
+- else
++ baud = 1200;
++ } else {
+ up->cflag = B4800 | CS8 | CLOCAL | CREAD;
++ baud = 4800;
++ }
++ quot = up->port.uartclk / (16 * baud);
+
+ sunsu_autoconfig(up);
+ if (up->port.type == PORT_UNKNOWN)
+@@ -1330,6 +1335,8 @@
+ serio_register_port(&up->serio);
+ #endif
+
++ sunsu_change_speed(&up->port, up->cflag, 0, quot);
++
+ sunsu_startup(&up->port);
+ }
+ return 0;