[PATCH] Re: interrupt problem with MPS 1.4 / not with MPS 1.1 ?
Does this patch fix things for you, such that MPS 1.1 and MPS 1.4 both
work?
--
Jeff Garzik | Disbelief, that's why you fail.
Building 1024|
MandrakeSoft |
diff -urN linux-2.4.5/drivers/pci/quirks.c linux.viairq/drivers/pci/quirks.c
--- linux-2.4.5/drivers/pci/quirks.cSat May 19 20:43:06 2001
+++ linux.viairq/drivers/pci/quirks.c Fri Jun 1 16:33:21 2001
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#undef DEBUG
@@ -267,6 +268,8 @@
/*
* VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
* devices to the external APIC.
+ *
+ * TODO: this should be done at IRQ assign time (pci_enable_device call)
*/
static void __init quirk_via_ioapic(struct pci_dev *dev)
{
@@ -277,6 +280,8 @@
else
tmp = 0x1f; /* all known bits (4-0) routed to external APIC */
+ printk(KERN_INFO "PCI: Setting Via APIC control\n");
+
/* Offset 0x58: External APIC IRQ output control */
pci_write_config_byte (dev, 0x58, tmp);
}
@@ -285,6 +290,35 @@
/*
+ * Via 686A/B: The PCI_INTERRUPT_LINE register for the on-chip
+ * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
+ * when written, it makes an internal connection to the PIC.
+ * For these devices, this register is defined to be 4 bits wide.
+ * Normally this is fine. However for IO-APIC motherboards, or
+ * non-x86 architectures (yes Via exists on PPC among other places),
+ * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
+ * interrupts delivered properly.
+ *
+ * TODO: this should be done at IRQ assign time (pci_enable_device call)
+ */
+static void __init quirk_via_irqpic(struct pci_dev *dev)
+{
+ u8 tmp;
+
+ pci_read_config_byte(dev, PCI_INTERRUPT_LINE, );
+if ((tmp & 0x0F) != dev->irq) {
+ printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n",
+ dev->slot_name, tmp, (tmp & 0xF0) | dev->irq);
+udelay (15);
+
+tmp &= 0xF0;
+tmp |= dev->irq;
+ pci_write_config_byte(dev, PCI_INTERRUPT_LINE, tmp);
+ }
+}
+
+
+/*
* PIIX3 USB: We have to disable USB interrupts that are
* hardwired to PIRQD# and may be shared with an
* external device.
@@ -372,6 +406,11 @@
#ifdef CONFIG_X86_IO_APIC
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686,
quirk_via_ioapic },
#endif
+
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_6,
+ quirk_via_irqpic },
{ 0 }
};
diff -urN linux-2.4.5/drivers/sound/via82cxxx_audio.c
linux.viairq/drivers/sound/via82cxxx_audio.c
--- linux-2.4.5/drivers/sound/via82cxxx_audio.c Tue May 1 19:05:00 2001
+++ linux.viairq/drivers/sound/via82cxxx_audio.cFri Jun 1 16:32:25 2001
@@ -3012,7 +3012,6 @@
{
int rc;
struct via_info *card;
- u8 tmp;
static int printed_version = 0;
DPRINTK ("ENTER\n");
@@ -3107,19 +3106,6 @@
if (rc) {
printk (KERN_ERR PFX "interrupt init failed, aborting\n");
goto err_out_have_proc;
- }
-
- pci_read_config_byte (pdev, 0x3C, );
- if ((tmp & 0x0F) != pdev->irq) {
- printk (KERN_WARNING PFX "IRQ fixup, 0x3C==0x%02X\n", tmp);
- udelay (15);
- tmp &= 0xF0;
- tmp |= pdev->irq;
- pci_write_config_byte (pdev, 0x3C, tmp);
- DPRINTK ("new 0x3c==0x%02x\n", tmp);
- } else {
- DPRINTK ("IRQ reg 0x3c==0x%02x, irq==%d\n",
- tmp, tmp & 0x0F);
}
printk (KERN_INFO PFX "board #%d at 0x%04lX, IRQ %d\n",
[PATCH] Re: interrupt problem with MPS 1.4 / not with MPS 1.1 ?
Does this patch fix things for you, such that MPS 1.1 and MPS 1.4 both
work?
--
Jeff Garzik | Disbelief, that's why you fail.
Building 1024|
MandrakeSoft |
diff -urN linux-2.4.5/drivers/pci/quirks.c linux.viairq/drivers/pci/quirks.c
--- linux-2.4.5/drivers/pci/quirks.cSat May 19 20:43:06 2001
+++ linux.viairq/drivers/pci/quirks.c Fri Jun 1 16:33:21 2001
@@ -17,6 +17,7 @@
#include linux/kernel.h
#include linux/pci.h
#include linux/init.h
+#include linux/delay.h
#undef DEBUG
@@ -267,6 +268,8 @@
/*
* VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
* devices to the external APIC.
+ *
+ * TODO: this should be done at IRQ assign time (pci_enable_device call)
*/
static void __init quirk_via_ioapic(struct pci_dev *dev)
{
@@ -277,6 +280,8 @@
else
tmp = 0x1f; /* all known bits (4-0) routed to external APIC */
+ printk(KERN_INFO PCI: Setting Via APIC control\n);
+
/* Offset 0x58: External APIC IRQ output control */
pci_write_config_byte (dev, 0x58, tmp);
}
@@ -285,6 +290,35 @@
/*
+ * Via 686A/B: The PCI_INTERRUPT_LINE register for the on-chip
+ * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
+ * when written, it makes an internal connection to the PIC.
+ * For these devices, this register is defined to be 4 bits wide.
+ * Normally this is fine. However for IO-APIC motherboards, or
+ * non-x86 architectures (yes Via exists on PPC among other places),
+ * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
+ * interrupts delivered properly.
+ *
+ * TODO: this should be done at IRQ assign time (pci_enable_device call)
+ */
+static void __init quirk_via_irqpic(struct pci_dev *dev)
+{
+ u8 tmp;
+
+ pci_read_config_byte(dev, PCI_INTERRUPT_LINE, tmp);
+if ((tmp 0x0F) != dev-irq) {
+ printk(KERN_INFO PCI: Via IRQ fixup for %s, from %d to %d\n,
+ dev-slot_name, tmp, (tmp 0xF0) | dev-irq);
+udelay (15);
+
+tmp = 0xF0;
+tmp |= dev-irq;
+ pci_write_config_byte(dev, PCI_INTERRUPT_LINE, tmp);
+ }
+}
+
+
+/*
* PIIX3 USB: We have to disable USB interrupts that are
* hardwired to PIRQD# and may be shared with an
* external device.
@@ -372,6 +406,11 @@
#ifdef CONFIG_X86_IO_APIC
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686,
quirk_via_ioapic },
#endif
+
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
+ quirk_via_irqpic },
+ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_6,
+ quirk_via_irqpic },
{ 0 }
};
diff -urN linux-2.4.5/drivers/sound/via82cxxx_audio.c
linux.viairq/drivers/sound/via82cxxx_audio.c
--- linux-2.4.5/drivers/sound/via82cxxx_audio.c Tue May 1 19:05:00 2001
+++ linux.viairq/drivers/sound/via82cxxx_audio.cFri Jun 1 16:32:25 2001
@@ -3012,7 +3012,6 @@
{
int rc;
struct via_info *card;
- u8 tmp;
static int printed_version = 0;
DPRINTK (ENTER\n);
@@ -3107,19 +3106,6 @@
if (rc) {
printk (KERN_ERR PFX interrupt init failed, aborting\n);
goto err_out_have_proc;
- }
-
- pci_read_config_byte (pdev, 0x3C, tmp);
- if ((tmp 0x0F) != pdev-irq) {
- printk (KERN_WARNING PFX IRQ fixup, 0x3C==0x%02X\n, tmp);
- udelay (15);
- tmp = 0xF0;
- tmp |= pdev-irq;
- pci_write_config_byte (pdev, 0x3C, tmp);
- DPRINTK (new 0x3c==0x%02x\n, tmp);
- } else {
- DPRINTK (IRQ reg 0x3c==0x%02x, irq==%d\n,
- tmp, tmp 0x0F);
}
printk (KERN_INFO PFX board #%d at 0x%04lX, IRQ %d\n,
