Bug#271852: marked as done (kernel-image-2.6.8-powerpc: VGA console broken on PReP)
Your message dated Sun, 03 Oct 2004 04:32:45 -0400
with message-id <E1CE1nR-0002rD-00@newraff.debian.org>
and subject line Bug#271852: fixed in kernel-source-2.6.8 2.6.8-7
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 15 Sep 2004 17:34:18 +0000
>From hollis@austin.rr.com Wed Sep 15 10:34:18 2004
Return-path: <hollis@austin.rr.com>
Received: from user-0vvde2s.cable.mindspring.com (miracle) [63.246.184.92]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1C7dfe-0000f8-00; Wed, 15 Sep 2004 10:34:18 -0700
Received: from hollis by miracle with local (Exim 3.36 #1 (Debian))
id 1C7ddg-0001Ip-00; Wed, 15 Sep 2004 12:32:16 -0500
Content-Type: multipart/mixed; boundary="===============1342883106=="
MIME-Version: 1.0
From: Hollis Blanchard <hollis@penguinppc.org>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: kernel-image-2.6.8-powerpc: VGA console broken on PReP
X-Mailer: reportbug 2.63
Date: Wed, 15 Sep 2004 12:32:14 -0500
Message-Id: <E1C7ddg-0001Ip-00@miracle>
Sender: Hollis <hollis@austin.rr.com>
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
This is a multi-part MIME message sent by reportbug.
--===============1342883106==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: kernel-image-2.6.8-powerpc
Version: 2.6.8-3
Severity: important
Tags: patch
The PReP bootloader code normally resets known VGA cards from
framebuffer mode used by the firmware to text mode so that VGA console
works. Unfortunately this code is broken in 2.6.8, and as a result the
VGA adapter gets stuck with a miscolored PowerPC logo on it.
The attached patch, which went into 2.6.9-rc2, fixes the problem.
-- System Information:
Debian Release: 3.1
APT prefers testing
APT policy: (500, 'testing')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.8
Locale: LANG=C, LC_CTYPE=C
Versions of packages kernel-image-2.6.8-powerpc depends on:
ii initrd-tools 0.1.74 tools to create initrd image for p
ii module-init-tools 3.1-pre5-6 tools for managing Linux kernel mo
-- no debconf information
--===============1342883106==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="ppc-boot-isa.diff"
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1865 -> 1.1867
# arch/ppc/boot/simple/Makefile 1.32 -> 1.33
# arch/ppc/boot/simple/misc-prep.c 1.1 -> 1.2
# arch/ppc/boot/include/nonstdio.h 1.5 -> 1.6
# arch/ppc/boot/simple/legacy.S 1.2 -> (deleted)
# arch/ppc/boot/common/misc-common.c 1.13 -> 1.14
# arch/ppc/boot/simple/misc.c 1.20 -> 1.21
# arch/ppc/boot/simple/chrpmap.S 1.2 -> (deleted)
# arch/ppc/boot/common/serial_stub.c 1.1 -> 1.2
# (new) -> 1.3 arch/ppc/boot/simple/prepmap.c
# (new) -> 1.3 arch/ppc/boot/simple/chrpmap.c
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/08/23 hollis@ambient.ltc.austin.ibm.com 1.1866
# reorg the boot stuff a little to reflect the following:
# - ISA_io doesn't need to be initialized with assembly
# - serial_fixups() just initializes ISA_io, so should be renamed
# - we must initialize ISA_io before calling vga_init()
# --------------------------------------------
# 04/08/24 hollis@ambient.ltc.austin.ibm.com 1.1867
# prepmap.c, chrpmap.c:
# abbreviate copyright and license
# --------------------------------------------
#
diff -Nru a/arch/ppc/boot/common/misc-common.c b/arch/ppc/boot/common/misc-common.c
--- a/arch/ppc/boot/common/misc-common.c Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/common/misc-common.c Tue Aug 24 12:37:26 2004
@@ -526,6 +526,11 @@
* on others it's an offset from a given location. -- Tom
*/
+void ISA_init(unsigned long base)
+{
+ ISA_io = (unsigned char *)base;
+}
+
void
outb(int port, unsigned char val)
{
diff -Nru a/arch/ppc/boot/common/serial_stub.c b/arch/ppc/boot/common/serial_stub.c
--- a/arch/ppc/boot/common/serial_stub.c Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/common/serial_stub.c Tue Aug 24 12:37:26 2004
@@ -11,11 +11,6 @@
* is" without any warranty of any kind, whether express or implied.
*/
-void __attribute__ ((weak))
-serial_fixups(void)
-{
-}
-
unsigned long __attribute__ ((weak))
serial_init(int chan, void *ignored)
{
diff -Nru a/arch/ppc/boot/include/nonstdio.h b/arch/ppc/boot/include/nonstdio.h
--- a/arch/ppc/boot/include/nonstdio.h Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/include/nonstdio.h Tue Aug 24 12:37:26 2004
@@ -30,3 +30,5 @@
extern void puts(const char *);
extern void udelay(long delay);
extern unsigned char inb(int port);
+extern void board_isa_init(void);
+extern void ISA_init(unsigned long base);
diff -Nru a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
--- a/arch/ppc/boot/simple/Makefile Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/simple/Makefile Tue Aug 24 12:37:26 2004
@@ -73,7 +73,7 @@
zimageinitrd-$(CONFIG_GEMINI) := zImage.initrd-STRIPELF
end-$(CONFIG_GEMINI) := gemini
- extra.o-$(CONFIG_K2) := legacy.o
+ extra.o-$(CONFIG_K2) := prepmap.o
end-$(CONFIG_K2) := k2
cacheflag-$(CONFIG_K2) := -include $(clear_L2_L3)
@@ -89,7 +89,7 @@
end-$(motorola) := pplus
# Overrides previous assingment
- extra.o-$(CONFIG_PPLUS) := legacy.o
+ extra.o-$(CONFIG_PPLUS) := prepmap.o
extra.o-$(CONFIG_LOPEC) := mpc10x_memory.o
zimage-$(pcore) := zImage-STRIPELF
@@ -100,7 +100,7 @@
zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS
zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS
- extra.o-$(CONFIG_PPC_PREP) := legacy.o
+ extra.o-$(CONFIG_PPC_PREP) := prepmap.o
misc-$(CONFIG_PPC_PREP) += misc-prep.o mpc10x_memory.o
end-$(CONFIG_PPC_PREP) := prep
diff -Nru a/arch/ppc/boot/simple/chrpmap.S b/arch/ppc/boot/simple/chrpmap.S
--- a/arch/ppc/boot/simple/chrpmap.S Tue Aug 24 12:37:26 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,19 +0,0 @@
-/*
- * arch/ppc/boot/simple/chrpmap.S
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * This will go and setup ISA_io to 0xFE00000 and return.
- */
-
-#include <asm/ppc_asm.h>
-
- .text
-
- .globl serial_fixups
-serial_fixups:
- lis r3,ISA_io@h /* Load ISA_io */
- ori r3,r3,ISA_io@l
- lis r4,0xFE00 /* Load the value, 0xFE00000 */
- stw r4,0(r3) /* store */
- blr
diff -Nru a/arch/ppc/boot/simple/chrpmap.c b/arch/ppc/boot/simple/chrpmap.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/arch/ppc/boot/simple/chrpmap.c Tue Aug 24 12:37:26 2004
@@ -0,0 +1,12 @@
+/*
+ * 2004 (C) IBM. This file is licensed under the terms of the GNU General
+ * Public License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <nonstdio.h>
+
+void board_isa_init(void)
+{
+ ISA_init(0xFE000000);
+}
diff -Nru a/arch/ppc/boot/simple/legacy.S b/arch/ppc/boot/simple/legacy.S
--- a/arch/ppc/boot/simple/legacy.S Tue Aug 24 12:37:26 2004
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,19 +0,0 @@
-/*
- * arch/ppc/boot/simple/legacy.S
- *
- * Author: Tom Rini <trini@mvista.com>
- *
- * This will go and setup ISA_io to 0x8000000 and return.
- */
-
-#include <asm/ppc_asm.h>
-
- .text
-
- .globl serial_fixups
-serial_fixups:
- lis r3,ISA_io@h /* Load ISA_io */
- ori r3,r3,ISA_io@l
- lis r4,0x8000 /* Load the value, 0x8000000 */
- stw r4,0(r3) /* store */
- blr
diff -Nru a/arch/ppc/boot/simple/misc-prep.c b/arch/ppc/boot/simple/misc-prep.c
--- a/arch/ppc/boot/simple/misc-prep.c Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/simple/misc-prep.c Tue Aug 24 12:37:26 2004
@@ -88,6 +88,7 @@
ofinit(OFW_interface);
}
+ board_isa_init();
#if defined(CONFIG_VGA_CONSOLE)
vga_init((unsigned char *)0xC0000000);
#endif /* CONFIG_VGA_CONSOLE */
diff -Nru a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
--- a/arch/ppc/boot/simple/misc.c Tue Aug 24 12:37:26 2004
+++ b/arch/ppc/boot/simple/misc.c Tue Aug 24 12:37:26 2004
@@ -97,7 +97,6 @@
struct bi_record *rec;
unsigned long initrd_loc, TotalMemory = 0;
- serial_fixups();
#ifdef CONFIG_SERIAL_8250_CONSOLE
com_port = serial_init(0, NULL);
#endif
@@ -268,10 +267,16 @@
return rec;
}
+void __attribute__ ((weak))
+board_isa_init(void)
+{
+}
+
/* Allow decompress_kernel to be hooked into. This is the default. */
void * __attribute__ ((weak))
load_kernel(unsigned long load_addr, int num_words, unsigned long cksum,
void *ign1, void *ign2)
{
+ board_isa_init();
return decompress_kernel(load_addr, num_words, cksum);
}
diff -Nru a/arch/ppc/boot/simple/prepmap.c b/arch/ppc/boot/simple/prepmap.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/arch/ppc/boot/simple/prepmap.c Tue Aug 24 12:37:26 2004
@@ -0,0 +1,12 @@
+/*
+ * 2004 (C) IBM. This file is licensed under the terms of the GNU General
+ * Public License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <nonstdio.h>
+
+void board_isa_init(void)
+{
+ ISA_init(0x80000000);
+}
--===============1342883106==--
---------------------------------------
Received: (at 271852-close) by bugs.debian.org; 3 Oct 2004 08:38:27 +0000
>From katie@ftp-master.debian.org Sun Oct 03 01:38:27 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CE1sx-00014P-00; Sun, 03 Oct 2004 01:38:27 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1CE1nR-0002rD-00; Sun, 03 Oct 2004 04:32:45 -0400
From: Andres Salomon <dilinger@voxel.net>
To: 271852-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#271852: fixed in kernel-source-2.6.8 2.6.8-7
Message-Id: <E1CE1nR-0002rD-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Sun, 03 Oct 2004 04:32:45 -0400
Delivered-To: 271852-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
X-CrossAssassin-Score: 9
Source: kernel-source-2.6.8
Source-Version: 2.6.8-7
We believe that the bug you reported is fixed in the latest version of
kernel-source-2.6.8, which is due to be installed in the Debian FTP archive:
kernel-doc-2.6.8_2.6.8-7_all.deb
to pool/main/k/kernel-source-2.6.8/kernel-doc-2.6.8_2.6.8-7_all.deb
kernel-patch-debian-2.6.8_2.6.8-7_all.deb
to pool/main/k/kernel-source-2.6.8/kernel-patch-debian-2.6.8_2.6.8-7_all.deb
kernel-source-2.6.8_2.6.8-7.diff.gz
to pool/main/k/kernel-source-2.6.8/kernel-source-2.6.8_2.6.8-7.diff.gz
kernel-source-2.6.8_2.6.8-7.dsc
to pool/main/k/kernel-source-2.6.8/kernel-source-2.6.8_2.6.8-7.dsc
kernel-source-2.6.8_2.6.8-7_all.deb
to pool/main/k/kernel-source-2.6.8/kernel-source-2.6.8_2.6.8-7_all.deb
kernel-tree-2.6.8_2.6.8-7_all.deb
to pool/main/k/kernel-source-2.6.8/kernel-tree-2.6.8_2.6.8-7_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 271852@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Andres Salomon <dilinger@voxel.net> (supplier of updated kernel-source-2.6.8 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 03 Oct 2004 03:21:14 -0400
Source: kernel-source-2.6.8
Binary: kernel-source-2.6.8 kernel-doc-2.6.8 kernel-tree-2.6.8 kernel-patch-debian-2.6.8
Architecture: source all
Version: 2.6.8-7
Distribution: unstable
Urgency: medium
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
Changed-By: Andres Salomon <dilinger@voxel.net>
Description:
kernel-doc-2.6.8 - Linux kernel specific documentation for version 2.6.8
kernel-patch-debian-2.6.8 - Debian patches to Linux 2.6.8
kernel-source-2.6.8 - Linux kernel source for version 2.6.8 with Debian patches
kernel-tree-2.6.8 - Linux kernel tree for building prepackaged Debian kernel images
Closes: 126482 153451 181350 206984 259056 267240 267342 270194 271852 272177 273474 274011
Changes:
kernel-source-2.6.8 (2.6.8-7) unstable; urgency=medium
.
* Fix VGA console on PReP systems (closes: #271852) (Jens Schmalzing).
.
* Really enable i915 agpgart support (Christoph Hellwig).
.
* Fix yet another bio leak (Christoph Hellwig).
.
* Switch /proc/sys/net/ipv4/tcp_default_win_scale default back to 0, there's
just too many broken system out there in the wild. (closes: #267342)
(Christoph Hellwig).
.
* Fix ata_piix controller numbering in combined mode (closes: #270194)
(Christoph Hellwig).
.
* Update tg3 driver (Christoph Hellwig).
.
* Update forcedeth driver to fix autoneg on 100Mbit cards (Christoph Hellwig).
.
* Fix ALSA module locking issue (closes: #259056) (Andres Salomon).
.
* Build-fix for 3c59x without pci (closes: #267240) (Maximilian Attems).
.
* Fix crash in ArcNet PCMCIA card (Maximilian Attems).
.
* Build-fix for airo on smp (Maximilian Attems).
.
* ACK old nmu (closes: #181350, #126482, #153451, #206984)
.
* Back out acpi-early caused problems on laptops, where APIC should not
be enabled. (closes: #272177, #273474, #274011) (Maximilian Attems)
Files:
970450a8551c5acbf3c5c0b30d9832ad 1645 devel optional kernel-source-2.6.8_2.6.8-7.dsc
d6b85b1910b841219bc2c76653be6fab 602945 devel optional kernel-source-2.6.8_2.6.8-7.diff.gz
b355bc84e45dc25db40df241ec1973e4 533300 devel optional kernel-patch-debian-2.6.8_2.6.8-7_all.deb
4336e90df29241a5804327d90cbd49eb 34913092 devel optional kernel-source-2.6.8_2.6.8-7_all.deb
eca9565121eefc887ea518fd006de113 21340 devel optional kernel-tree-2.6.8_2.6.8-7_all.deb
d08071368b7de28571f2f4cecacf62eb 6145666 doc optional kernel-doc-2.6.8_2.6.8-7_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: http://triplehelix.org/~joshk/pubkey_gpg.asc
iQIVAwUBQV+2HaOILr94RG8mAQLsCw/5AXgGwZmYLbC9MdbofG7rEfgKMwyNMWNa
rKHLshj0e6DHUHHW8wB/vnzRlofaF1qDETyx2NPR8hwKtuKzWlVR1nzr9aD5jFfk
LNySzA5rzIAAds4yg5wr/NddDcH90YXhQTz4t6ENDy018OM4FSJGKy++M91wPBbZ
ozZSL8LPt19cCi3Cd/8ClDOfozndQwa8JZxjx9X2xwULJ2AjPFxgzS9VoZCGGVob
9EfHmlIsYEaH8BeXJ6c1bHBPxf8ucIVtXS7yBxz+hCdOaYi6LUiB/ql/DRpAhMUh
vBQ1dMNMDVohvwUVnwV/W3uBFvRKB1hyIlnrrzXNwUOt2+UqBMbO+VLWYfa/HOs4
yo/N94wr7eZC85cPz9P17mFQ2my8ZOU7unMl4Vn4e9XD00UEtujsDf9xuFtfQ2s+
0Wb3UYKxjWnlr/+xViYmqyThSCG9dpWAIRlzbI+P7pEcwcvz+4MAS182zcq5Q1jQ
ns06BrxAWj35cwbpJyUX+dmBSjIWd1CkWs2q2CeKCN4gvT1OBAokszkoR8o1lIxs
+IdrMKGF0DYZWC4CHWNsu7J/g1aB3gxFcu3AQaqU1lrCasR/LHbi3cCk9EVrdvLI
e9Kszw6vbwRj1ftUqpJ/IBy2n4NpZAvzKOw1FgHW7Xm7nnqiIOdPLWEzfqfTqveN
i4iGpvj37/Y=
=xqB1
-----END PGP SIGNATURE-----
Reply to: