From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S267880AbUIXGow (ORCPT ); Fri, 24 Sep 2004 02:44:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S268520AbUIXGlq (ORCPT ); Fri, 24 Sep 2004 02:41:46 -0400 Received: from fmr04.intel.com ([143.183.121.6]:7906 "EHLO caduceus.sc.intel.com") by vger.kernel.org with ESMTP id S267880AbUIXGhr (ORCPT ); Fri, 24 Sep 2004 02:37:47 -0400 Date: Thu, 23 Sep 2004 23:37:45 -0700 From: Suresh Siddha To: linux-kernel@vger.kernel.org Cc: asit.k.mallick@intel.com Subject: [Patch 2/2] Disable SW irqbalance/irqaffinity for E7520/E7320/E7525 Message-ID: <20040923233745.C19555@unix-os.sc.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add pci quirks to disable irq_balance/affinity for E7520/E7320/E7525 with revision ID 0x09 and below. Signed-off-by: Suresh Siddha diff -Nru linux-2.6.9-rc2/arch/i386/kernel/io_apic.c linux-irq/arch/i386/kernel/io_apic.c --- linux-2.6.9-rc2/arch/i386/kernel/io_apic.c 2004-09-12 22:32:00.000000000 -0700 +++ linux-irq/arch/i386/kernel/io_apic.c 2004-09-01 17:49:37.000000000 -0700 @@ -570,6 +570,8 @@ } for ( ; ; ) { + if (irqbalance_disabled) + return 0; set_current_state(TASK_INTERRUPTIBLE); time_remaining = schedule_timeout(time_remaining); if (time_after(jiffies, @@ -636,7 +638,7 @@ return 0; } -static int __init irqbalance_disable(char *str) +int __init irqbalance_disable(char *str) { irqbalance_disabled = 1; return 0; @@ -646,6 +648,8 @@ static inline void move_irq(int irq) { + if (irqbalance_disabled) + return; /* note - we hold the desc->lock */ if (unlikely(!cpus_empty(pending_irq_balance_cpumask[irq]))) { set_ioapic_affinity_irq(irq, pending_irq_balance_cpumask[irq]); diff -Nru linux-2.6.9-rc2/arch/i386/kernel/irq.c linux-irq/arch/i386/kernel/irq.c --- linux-2.6.9-rc2/arch/i386/kernel/irq.c 2004-09-12 22:31:30.000000000 -0700 +++ linux-irq/arch/i386/kernel/irq.c 2004-09-01 17:49:37.000000000 -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-rc2/arch/x86_64/kernel/irq.c linux-irq/arch/x86_64/kernel/irq.c --- linux-2.6.9-rc2/arch/x86_64/kernel/irq.c 2004-09-12 22:32:26.000000000 -0700 +++ linux-irq/arch/x86_64/kernel/irq.c 2004-09-01 17:49:37.000000000 -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-rc2/drivers/pci/quirks.c linux-irq/drivers/pci/quirks.c --- linux-2.6.9-rc2/drivers/pci/quirks.c 2004-09-12 22:31:27.000000000 -0700 +++ linux-irq/drivers/pci/quirks.c 2004-09-01 18:09:21.000000000 -0700 @@ -814,6 +814,56 @@ 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 ); +#ifdef CONFIG_X86_IO_APIC +#include +#ifdef CONFIG_IRQBALANCE +extern int irqbalance_disable(char *str); +#endif +extern int no_irq_affinity; +extern int noirqdebug_setup(char *str); + + +static 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(""); + setup_ioapic_dest(); +#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-rc2/include/linux/pci_ids.h linux-irq/include/linux/pci_ids.h --- linux-2.6.9-rc2/include/linux/pci_ids.h 2004-09-12 22:33:54.000000000 -0700 +++ linux-irq/include/linux/pci_ids.h 2004-09-01 17:49:37.000000000 -0700 @@ -2204,6 +2204,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