===== arch/i386/kernel/i8259.c 1.38 vs edited =====
--- 1.38/arch/i386/kernel/i8259.c	2004-10-20 04:37:14 -04:00
+++ edited/arch/i386/kernel/i8259.c	2004-11-20 03:18:08 -05:00
@@ -243,10 +243,21 @@
 /**
  * ELCR registers (0x4d0, 0x4d1) control edge/level of IRQ
  */
-static void restore_ELCR(char *trigger)
+
+void restore_ELCR(char *trigger)
 {
 	outb(trigger[0], 0x4d0);
 	outb(trigger[1], 0x4d1);
+}
+
+void
+clear_ELCR(void)
+{
+	char trigger[2] = {0, 0};
+
+	restore_ELCR(trigger);
+	printk("clear ELCR\n");
+	print_ICH_PIC();	/* XXX debug */
 }
 
 static void save_ELCR(char *trigger)
===== arch/i386/kernel/acpi/boot.c 1.75 vs edited =====
--- 1.75/arch/i386/kernel/acpi/boot.c	2004-11-11 19:08:40 -05:00
+++ edited/arch/i386/kernel/acpi/boot.c	2004-11-20 01:23:46 -05:00
@@ -801,7 +801,9 @@
 acpi_boot_init (void)
 {
 	int error;
-
+	extern int print_ICH_PIC(void);
+	
+	print_ICH_PIC();
 	/*
 	 * If acpi_disabled, bail out
 	 * One exception: acpi=ht continues far enough to enumerate LAPICs
===== arch/i386/pci/acpi.c 1.18 vs edited =====
--- 1.18/arch/i386/pci/acpi.c	2004-10-19 00:44:01 -04:00
+++ edited/arch/i386/pci/acpi.c	2004-11-20 01:23:46 -05:00
@@ -56,6 +56,10 @@
 	if (acpi_ioapic)
 		print_IO_APIC();
 #endif
+	{
+		extern int print_ICH_PIC(void);
+		print_ICH_PIC();
+	}
 
 	return 0;
 }
===== drivers/acpi/bus.c 1.47 vs edited =====
--- 1.47/drivers/acpi/bus.c	2004-11-02 02:40:09 -05:00
+++ edited/drivers/acpi/bus.c	2004-11-20 03:47:22 -05:00
@@ -31,6 +31,7 @@
 #include <linux/proc_fs.h>
 #ifdef CONFIG_X86
 #include <asm/mpspec.h>
+#include <asm/i8259.h>
 #endif
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
@@ -629,6 +630,11 @@
 #ifdef CONFIG_X86
 	if (!acpi_ioapic) {
 		extern acpi_interrupt_flags acpi_sci_flags;
+
+		if (acpi_dbg_level == 1) /* XXX hack use of dbg flag */
+			printk("NOT clearing ELCR\n");
+		else
+			clear_ELCR();
 
 		/* compatible (0) means level (3) */
 		if (acpi_sci_flags.trigger == 0)
===== drivers/acpi/pci_link.c 1.34 vs edited =====
--- 1.34/drivers/acpi/pci_link.c	2004-11-02 02:40:09 -05:00
+++ edited/drivers/acpi/pci_link.c	2004-11-20 03:47:34 -05:00
@@ -54,6 +54,56 @@
 #define ACPI_PCI_LINK_FILE_STATUS	"state"
 
 #define ACPI_PCI_LINK_MAX_POSSIBLE 16
+int print_ICH_PIC(void)
+{
+	extern spinlock_t i8259A_lock;
+	unsigned int v;
+	u8 b;
+	unsigned long flags;
+	int i;
+
+	spin_lock_irqsave(&i8259A_lock, flags);
+
+	v = inb(0xa1) << 8 | inb(0x21);
+	printk(KERN_DEBUG "... PIC  IMR: %04x\n", v);
+
+	v = inb(0xa0) << 8 | inb(0x20);
+	printk(KERN_DEBUG "... PIC  IRR: %04x\n", v);
+
+	outb(0x0b,0xa0);
+	outb(0x0b,0x20);
+	v = inb(0xa0) << 8 | inb(0x20);
+	outb(0x0a,0xa0);
+	outb(0x0a,0x20);
+
+	spin_unlock_irqrestore(&i8259A_lock, flags);
+
+	printk(KERN_DEBUG "... PIC  ISR: %04x\n", v);
+
+	v = inb(0x4d1) << 8 | inb(0x4d0);
+	printk(KERN_DEBUG "... PIC ELCR: %04x\n", v);
+#define PCI_CONF1_ADDRESS(bus, devfn, reg) \
+        (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3))
+
+	for (i = 0; i < 8; ++i) {
+		u32 bus = 0;
+		u32 devfn = 0x1F << 3; /* ICH is dev 31, func 0 */
+		u32 reg;
+
+		if (i < 4)
+			reg = 0x60 + i;
+		else
+			reg = 0x64 + i;
+
+		outl(PCI_CONF1_ADDRESS(bus, devfn, reg), 0xCF8);
+		b = inb(0xCFC + (reg & 3));
+		printk("PIRQ%c -> IRQ%d %s\n", 'A' + i, b & 0xF,
+		       b & 0x80  ? "disabled" : "ACTIVE");
+	}
+	return 0;
+}
+
+late_initcall(print_ICH_PIC);
 
 static int acpi_pci_link_add (struct acpi_device *device);
 static int acpi_pci_link_remove (struct acpi_device *device, int type);
@@ -475,6 +525,8 @@
 	struct acpi_pci_link    *link = NULL;
 	int			i = 0;
 
+print_ICH_PIC();
+
 	ACPI_FUNCTION_TRACE("acpi_irq_penalty_init");
 
 	/*
@@ -685,8 +737,15 @@
 	acpi_link.count++;
 
 end:
+
 	/* disable all links -- to be activated on use */
+if (acpi_dbg_level == 1) {
+	printk("NOT _DISabled\n");
+} else {
 	acpi_ut_evaluate_object(link->handle, "_DIS", 0, NULL);
+	printk("_DISabled\n");
+}
+
 
 	if (result)
 		kfree(link);
@@ -865,6 +924,9 @@
 
 	if (acpi_noirq)
 		return_VALUE(0);
+
+printk("LENB: ACPI has not touched Links yet\n");
+print_ICH_PIC();
 
 	acpi_link.count = 0;
 	INIT_LIST_HEAD(&acpi_link.entries);
===== include/asm-i386/i8259.h 1.2 vs edited =====
--- 1.2/include/asm-i386/i8259.h	2003-03-06 13:14:05 -05:00
+++ edited/include/asm-i386/i8259.h	2004-11-20 03:17:06 -05:00
@@ -13,5 +13,7 @@
 extern void enable_8259A_irq(unsigned int irq);
 extern void disable_8259A_irq(unsigned int irq);
 extern unsigned int startup_8259A_irq(unsigned int irq);
+extern void clear_ELCR(void);
+extern void print_ICH_PIC(void);	/* debug hack only */
 
 #endif	/* __ASM_I8259_H__ */