From: Olaf Hering <olaf@aepfle.de>
To: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH] restore parport_pc probing on powermac
Date: Mon, 2 Oct 2006 14:04:31 +0200 [thread overview]
Message-ID: <20061002120431.GA14670@aepfle.de> (raw)
The last change for partport_pc did fix the common case for all PowerMacs,
but it broke the case for PCI multiport IO cards.
In fact, the config option CONFIG_PARPORT_PC_SUPERIO=y lead to a hard crash
when cups probed the parport driver. It enables the winbond and smsc probing.
Remove the PARPORT_BASE check again, parport_pc_find_nonpci_ports() will take
care of it.
All powerpc configs should have CONFIG_PARPORT_PC_SUPERIO=n, the code did not
find anything on the chrp boards we tested it on.
Tested on a G4/466 with a PCI card:
0001:10:13.0 Serial controller: Timedia Technology Co Ltd PCI2S550 (Dual 16550 UART) (rev 01) (prog-if 02 [16550])
Subsystem: Timedia Technology Co Ltd Unknown device 5079
Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping+ SERR- FastB2B-
Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR-
Interrupt: pin A routed to IRQ 53
Region 0: I/O ports at f2000800 [size=32]
Region 2: I/O ports at f2000870 [size=8]
Region 3: I/O ports at f2000860 [size=8]
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
arch/powerpc/platforms/pseries/setup.c | 6 ------
drivers/parport/parport_pc.c | 4 ----
include/asm-powerpc/io.h | 1 -
3 files changed, 11 deletions(-)
Index: linux-2.6.18-git17/arch/powerpc/platforms/pseries/setup.c
===================================================================
--- linux-2.6.18-git17.orig/arch/powerpc/platforms/pseries/setup.c
+++ linux-2.6.18-git17/arch/powerpc/platforms/pseries/setup.c
@@ -415,12 +415,6 @@ static int pSeries_check_legacy_ioport(u
return -ENODEV;
of_node_put(np);
break;
- case PARALLEL_BASE:
- np = of_find_node_by_type(NULL, "parallel");
- if (np == NULL)
- return -ENODEV;
- of_node_put(np);
- break;
}
return 0;
}
Index: linux-2.6.18-git17/drivers/parport/parport_pc.c
===================================================================
--- linux-2.6.18-git17.orig/drivers/parport/parport_pc.c
+++ linux-2.6.18-git17/drivers/parport/parport_pc.c
@@ -3374,10 +3374,6 @@ __setup("parport_init_mode=",parport_ini
static int __init parport_pc_init(void)
{
-#if defined(CONFIG_PPC_MERGE)
- if (check_legacy_ioport(PARALLEL_BASE))
- return -ENODEV;
-#endif
if (parse_parport_params())
return -EINVAL;
Index: linux-2.6.18-git17/include/asm-powerpc/io.h
===================================================================
--- linux-2.6.18-git17.orig/include/asm-powerpc/io.h
+++ linux-2.6.18-git17/include/asm-powerpc/io.h
@@ -11,7 +11,6 @@
/* Check of existence of legacy devices */
extern int check_legacy_ioport(unsigned long base_port);
-#define PARALLEL_BASE 0x378
#define PNPBIOS_BASE 0xf000 /* only relevant for PReP */
#ifndef CONFIG_PPC64
reply other threads:[~2006-10-02 12:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061002120431.GA14670@aepfle.de \
--to=olaf@aepfle.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.