Re: [Patch 0/2] Disable SW irqbalance/irqaffinity for E7520/E7320/E7525
From: Suresh Siddha
Date: Thu Sep 30 2004 - 20:17:55 EST
On Thu, Sep 30, 2004 at 03:51:34PM -0700, Andrew Morton wrote:
> Please don't put extern declarations in .c files.
Ok Andrew. Here is the new patch.
thanks,
suresh
--
As part of the workaround for the "Interrupt message re-ordering across
hub interface" errata (page #16 in
http://developer.intel.com/design/chipsets/specupdt/30288402.pdf),
BIOS may enable hardware IRQ balancing for E7520/E7320/E7525(revision ID
0x9 and below) based platforms.
Add pci quirks to disable SW irqbalance/affinity on those platforms.
Move balanced_irq_init() to late_initcall so that kirqd will be started
after pci quirks.
Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
diff -Nru linux-2.6.9-rc3/arch/i386/kernel/io_apic.c linux-irq/arch/i386/kernel/io_apic.c
--- linux-2.6.9-rc3/arch/i386/kernel/io_apic.c 2004-09-29 20:04:25.000000000 -0700
+++ linux-irq/arch/i386/kernel/io_apic.c 2004-09-10 21:44:01.951220200 -0700
@@ -636,7 +636,7 @@
return 0;
}
-static int __init irqbalance_disable(char *str)
+int __init irqbalance_disable(char *str)
{
irqbalance_disabled = 1;
return 0;
@@ -653,7 +653,7 @@
}
}
-__initcall(balanced_irq_init);
+late_initcall(balanced_irq_init);
#else /* !CONFIG_IRQBALANCE */
static inline void move_irq(int irq) { }
diff -Nru linux-2.6.9-rc3/arch/i386/kernel/irq.c linux-irq/arch/i386/kernel/irq.c
--- linux-2.6.9-rc3/arch/i386/kernel/irq.c 2004-09-29 20:03:51.000000000 -0700
+++ linux-irq/arch/i386/kernel/irq.c 2004-09-10 21:44:01.951220200 -0700
@@ -272,7 +272,7 @@
static int noirqdebug;
-static int __init noirqdebug_setup(char *str)
+int __init noirqdebug_setup(char *str)
{
noirqdebug = 1;
printk("IRQ lockup detection disabled\n");
@@ -997,13 +997,15 @@
return len;
}
+int no_irq_affinity;
+
static int irq_affinity_write_proc(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
int irq = (long)data, full_count = count, err;
cpumask_t new_value, tmp;
- if (!irq_desc[irq].handler->set_affinity)
+ if (!irq_desc[irq].handler->set_affinity || no_irq_affinity)
return -EIO;
err = cpumask_parse(buffer, count, new_value);
diff -Nru linux-2.6.9-rc3/arch/x86_64/kernel/irq.c linux-irq/arch/x86_64/kernel/irq.c
--- linux-2.6.9-rc3/arch/x86_64/kernel/irq.c 2004-09-29 20:04:32.000000000 -0700
+++ linux-irq/arch/x86_64/kernel/irq.c 2004-09-10 21:44:01.952220048 -0700
@@ -835,6 +835,8 @@
return len;
}
+int no_irq_affinity;
+
static int irq_affinity_write_proc (struct file *file,
const char __user *buffer,
unsigned long count, void *data)
@@ -842,7 +844,7 @@
int irq = (long) data, full_count = count, err;
cpumask_t tmp, new_value;
- if (!irq_desc[irq].handler->set_affinity)
+ if (!irq_desc[irq].handler->set_affinity || no_irq_affinity)
return -EIO;
err = cpumask_parse(buffer, count, new_value);
diff -Nru linux-2.6.9-rc3/drivers/pci/quirks.c linux-irq/drivers/pci/quirks.c
--- linux-2.6.9-rc3/drivers/pci/quirks.c 2004-09-29 20:03:48.000000000 -0700
+++ linux-irq/drivers/pci/quirks.c 2004-09-10 22:07:13.033743512 -0700
@@ -814,6 +814,49 @@
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, asus_hides_smbus_lpc );
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP)
+#include <asm/irq.h>
+
+void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
+{
+ u8 config, rev;
+ u32 word;
+ extern struct pci_raw_ops *raw_pci_ops;
+
+ pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
+ if (rev > 0x9)
+ return;
+
+ printk(KERN_INFO "Intel E7520/7320/7525 detected.");
+
+ /* enable access to config space*/
+ pci_read_config_byte(dev, 0xf4, &config);
+ config |= 0x2;
+ pci_write_config_byte(dev, 0xf4, config);
+
+ /* read xTPR register */
+ raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
+
+ if (!(word & (1 << 13))) {
+ printk(KERN_INFO "Disabling irq balancing and affinity\n");
+#ifdef __i386__
+#ifdef CONFIG_IRQBALANCE
+ irqbalance_disable("");
+#endif
+ noirqdebug_setup("");
+#endif
+ no_irq_affinity = 1;
+ }
+
+ config &= ~0x2;
+ /* disable access to config space*/
+ pci_write_config_byte(dev, 0xf4, config);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SMCH, quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7320_MCH, quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quirk_intel_irqbalance);
+#endif
+
/*
* SiS 96x south bridge: BIOS typically hides SMBus device...
*/
diff -Nru linux-2.6.9-rc3/include/asm-i386/irq.h linux-irq/include/asm-i386/irq.h
--- linux-2.6.9-rc3/include/asm-i386/irq.h 2004-09-29 20:05:19.000000000 -0700
+++ linux-irq/include/asm-i386/irq.h 2004-09-10 22:03:40.351076192 -0700
@@ -55,4 +55,10 @@
asmlinkage int handle_IRQ_event(unsigned int, struct pt_regs *,
struct irqaction *);
+#ifdef CONFIG_IRQBALANCE
+extern int irqbalance_disable(char *str);
+#endif
+extern int no_irq_affinity;
+extern int noirqdebug_setup(char *str);
+
#endif /* _ASM_IRQ_H */
diff -Nru linux-2.6.9-rc3/include/asm-x86_64/irq.h linux-irq/include/asm-x86_64/irq.h
--- linux-2.6.9-rc3/include/asm-x86_64/irq.h 2004-09-29 20:03:42.000000000 -0700
+++ linux-irq/include/asm-x86_64/irq.h 2004-09-10 21:59:46.831576552 -0700
@@ -57,4 +57,6 @@
struct pt_regs;
int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *);
+extern int no_irq_affinity;
+
#endif /* _ASM_IRQ_H */
diff -Nru linux-2.6.9-rc3/include/linux/pci_ids.h linux-irq/include/linux/pci_ids.h
--- linux-2.6.9-rc3/include/linux/pci_ids.h 2004-09-29 20:06:05.000000000 -0700
+++ linux-irq/include/linux/pci_ids.h 2004-09-10 21:44:01.954219744 -0700
@@ -2205,6 +2205,8 @@
#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
#define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582
#define PCI_DEVICE_ID_INTEL_SMCH 0x3590
+#define PCI_DEVICE_ID_INTEL_E7320_MCH 0x3592
+#define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
#define PCI_DEVICE_ID_INTEL_80310 0x530d
#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/