Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S283052AbRLIFrV>; Sun, 9 Dec 2001 00:47:21 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S283054AbRLIFrM>; Sun, 9 Dec 2001 00:47:12 -0500
Received: from mtiwmhc23.worldnet.att.net ([204.127.131.48]:25294 "EHLO
	mtiwmhc23.worldnet.att.net") by vger.kernel.org with ESMTP
	id <S283052AbRLIFqz>; Sun, 9 Dec 2001 00:46:55 -0500
Subject: Re: IRQ Routing Problem on ALi Chipset Laptop (HP Pavilion N5425)
From: Cory Bell <cory.bell@usa.net>
To: Pavel Machek <pavel@suse.cz>
Cc: John Clemens <john@deater.net>,
        Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de>,
        linux-kernel@vger.kernel.org
In-Reply-To: <20011207213313.A176@elf.ucw.cz>
In-Reply-To: <Pine.LNX.4.33.0112060938340.32381-100000@pianoman.cluster.toy>
	<1007685691.6675.1.camel@localhost.localdomain> 
	<20011207213313.A176@elf.ucw.cz>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
X-Mailer: Evolution/1.0 (Preview Release)
Date: 08 Dec 2001 21:37:31 -0800
Message-Id: <1007876254.17062.0.camel@localhost.localdomain>
Mime-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 2001-12-07 at 12:33, Pavel Machek wrote:

> Hey, this gross hack fixed USB on HP OmniBook xe3. Good! (Perhaps you
> know what interrupt is right for maestro3, also on omnibook? ;-).

On my Pavilion (and the other 5400's as far as I can tell), maestro's on
irq 5. Wanna send me a "dump_pirq" and a "lspci -vvvxxx"? Could you try
the patch below (inspired by/stolen from Kai Germaschewski)? Also, the
newest acpi patch will print out the acpi irq routing table - might have
your info. You can tell if the patch below had any effect because it
will say it ASSIGNED IRQ XX instead of FOUND.

I believe the Omnibook XEs and the Pavilion N5400's are very similar
hardware. Several of the drivers I've seen on HP's website appear to
apply to both. If you want to help get the BIOS updated (the root cause,
IMHO), please call HP support and reference case number 1429683616 (that
9 may be a 4 - my handwriting is horrible). That's the case I logged
with thim about the broken PIR table (USB irq showing 9; being 11) and
failure to enable sse on athlon 4/duron/xp chips.

Thanks for the info!

-Cory

The "honor the irq mask" approach (works on my machine):
--- /home/cbell/linux-2.4/arch/i386/kernel/pci-irq.c	Fri Dec  7 01:51:41 2001
+++ /home/cbell/linux-2.4-test/arch/i386/kernel/pci-irq.c	Sat Dec  8 21:04:37 2001
@@ -581,6 +581,7 @@
 	 * reported by the device if possible.
 	 */
 	newirq = dev->irq;
+	if (!((1 << newirq) & mask)) newirq = 0;
 	if (!newirq && assign) {
 		for (i = 0; i < 16; i++) {
 			if (!(mask & (1 << i)))
@@ -599,7 +600,7 @@
 		irq = pirq & 0xf;
 		DBG(" -> hardcoded IRQ %d\n", irq);
 		msg = "Hardcoded";
-	} else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq))) {
+	} else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq) && ((1 << irq) & mask))) {
 		DBG(" -> got IRQ %d\n", irq);
 		msg = "Found";
 	} else if (newirq && r->set && (dev->class >> 8) != PCI_CLASS_DISPLAY_VGA) {
@@ -633,7 +634,7 @@
 			continue;
 		if (info->irq[pin].link == pirq) {
 			/* We refuse to override the dev->irq information. Give a warning! */
-		    	if (dev2->irq && dev2->irq != irq) {
+		    	if (dev2->irq && dev2->irq != irq && ((1 << dev2->irq) & mask)) {
 		    		printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
 				       dev2->slot_name, dev2->irq, irq);
 		    		continue;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/