From: Daniel Ritz <daniel.ritz@gmx.ch>

Acer travelmate 360 has a broken interrupt routing.  There's an interrupt
storm on irq 10 w/o this patch as soon as yenta_socket is loaded.  The
problem has been seen on different machines (reported on l-k and on
pcmcia-cs list).  There's also an USB controller on the same interrupt line
as the CB which also works fine after the patch.  And routing via ACPI
fails too.


---

 25-akpm/arch/i386/kernel/dmi_scan.c |   28 ++++++++++++++++++++++++++++
 25-akpm/arch/i386/pci/irq.c         |    8 ++++++++
 2 files changed, 36 insertions(+)

diff -puN arch/i386/kernel/dmi_scan.c~fix-acer-travelmate-360-interrupt-routing arch/i386/kernel/dmi_scan.c
--- 25/arch/i386/kernel/dmi_scan.c~fix-acer-travelmate-360-interrupt-routing	Wed Apr 28 14:16:12 2004
+++ 25-akpm/arch/i386/kernel/dmi_scan.c	Wed Apr 28 14:16:12 2004
@@ -360,6 +360,22 @@ static __init int fix_broken_hp_bios_irq
 }
 
 /*
+ * Work around broken Acer TravelMate 360 Notebooks which assign Cardbus to
+ * IRQ 11 even though it is actually wired to IRQ 10
+ */
+static __init int fix_acer_tm360_irqrouting(struct dmi_blacklist *d)
+{
+#ifdef CONFIG_PCI
+	extern int acer_tm360_irqrouting;
+	if (acer_tm360_irqrouting == 0)
+	{
+		acer_tm360_irqrouting = 1;
+		printk(KERN_INFO "%s detected - fixing broken IRQ routing\n", d->ident);
+	}
+#endif
+	return 0;
+}
+/*
  *  Check for clue free BIOS implementations who use
  *  the following QA technique
  *
@@ -844,6 +860,13 @@ static __initdata struct dmi_blacklist d
 			MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook Model GE"),
 			MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736")
 			} },
+
+	{ fix_acer_tm360_irqrouting, "Acer TravelMate 36x Laptop", {
+			MATCH(DMI_SYS_VENDOR, "Acer"),
+			MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
+			NO_MATCH, NO_MATCH
+			} },
+
  
 
 	/*
@@ -1033,6 +1056,11 @@ static __initdata struct dmi_blacklist d
 			MATCH(DMI_BOARD_NAME, "PR-DLS"),
 			MATCH(DMI_BIOS_VERSION, "ASUS PR-DLS ACPI BIOS Revision 1010"),
 			MATCH(DMI_BIOS_DATE, "03/21/2003") }},
+	{ disable_acpi_pci, "Acer TravelMate 36x Laptop", {
+			MATCH(DMI_SYS_VENDOR, "Acer"),
+			MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
+			NO_MATCH, NO_MATCH
+			} },
 #endif
 
 	{ NULL, }
diff -puN arch/i386/pci/irq.c~fix-acer-travelmate-360-interrupt-routing arch/i386/pci/irq.c
--- 25/arch/i386/pci/irq.c~fix-acer-travelmate-360-interrupt-routing	Wed Apr 28 14:16:12 2004
+++ 25-akpm/arch/i386/pci/irq.c	Wed Apr 28 14:16:12 2004
@@ -23,6 +23,7 @@
 #define PIRQ_VERSION 0x0100
 
 int broken_hp_bios_irq9;
+int acer_tm360_irqrouting;
 
 static struct irq_routing_table *pirq_table;
 
@@ -746,6 +747,13 @@ static int pcibios_lookup_irq(struct pci
 		r->set(pirq_router_dev, dev, pirq, 11);
 	}
 
+	/* same for Acer Travelmate 360, but with CB and irq 11 -> 10 */
+	if (acer_tm360_irqrouting && pirq == 0x63 && dev->irq == 11) {
+		dev->irq = 10;
+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
+		r->set(pirq_router_dev, dev, pirq, 10);
+	}
+
 	/*
 	 * Find the best IRQ to assign: use the one
 	 * reported by the device if possible.

_