From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261428AbUBTWo2 (ORCPT ); Fri, 20 Feb 2004 17:44:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261426AbUBTWoH (ORCPT ); Fri, 20 Feb 2004 17:44:07 -0500 Received: from stat1.steeleye.com ([65.114.3.130]:10159 "EHLO hancock.sc.steeleye.com") by vger.kernel.org with ESMTP id S261400AbUBTWmz (ORCPT ); Fri, 20 Feb 2004 17:42:55 -0500 Subject: [PATCH] 2/2 add the Intel Alder IO-APIC PCI device to quirks From: James Bottomley To: Andrew Morton , Linus Torvalds Cc: Linux Kernel Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Mailer: Ximian Evolution 1.0.8 (1.0.8-9) Date: 20 Feb 2004 14:42:52 -0800 Message-Id: <1077316973.1769.12.camel@mulgrave> Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The alder has an intel Extended Express System Support Controller which presents apparently spurious BARs. When the pci resource code tries to reassign these BARs, the second IO-APIC gets disabled (with disastrous consequences). The first BAR is the actual IO-APIC, the remaining five bars seem to be spurious resources, so we forcibly insert the first one into the resource tree and clear all the others. James ===== drivers/pci/quirks.c 1.40 vs edited ===== --- 1.40/drivers/pci/quirks.c Wed Feb 18 05:31:36 2004 +++ edited/drivers/pci/quirks.c Fri Feb 20 14:35:36 2004 @@ -789,6 +789,29 @@ sis_96x_compatible = 1; } +#ifdef CONFIG_X86_IO_APIC +static void __init quirk_alder_ioapic(struct pci_dev *pdev) +{ + int i; + + if ((pdev->class >> 8) != 0xff00) + return; + + /* the first BAR is the location of the IO APIC...we must + * not touch this (and it's already covered by the fixmap), so + * forcibly insert it into the resource tree */ + if(pci_resource_start(pdev, 0) && pci_resource_len(pdev, 0)) + insert_resource(&iomem_resource, &pdev->resource[0]); + + /* The next five BARs all seem to be rubbish, so just clean + * them out */ + for(i=1; i < 6; i++) { + memset(&pdev->resource[i], 0, sizeof(pdev->resource[i])); + } + +} +#endif + #ifdef CONFIG_SCSI_SATA static void __init quirk_intel_ide_combined(struct pci_dev *pdev) { @@ -914,6 +937,7 @@ { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_ANY_ID, quirk_ioapic_rmw }, { PCI_FIXUP_FINAL, PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC, quirk_amd_8131_ioapic }, + { PCI_FIXUP_HEADER, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic }, #endif { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_via_acpi }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_acpi }, ===== include/linux/pci_ids.h 1.139 vs edited ===== --- 1.139/include/linux/pci_ids.h Fri Feb 20 08:57:29 2004 +++ edited/include/linux/pci_ids.h Fri Feb 20 14:35:38 2004 @@ -1928,6 +1928,7 @@ #define PCI_DEVICE_ID_GENROCO_HFP832 0x0003 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_EESSC 0x0008 #define PCI_DEVICE_ID_INTEL_21145 0x0039 #define PCI_DEVICE_ID_INTEL_82375 0x0482 #define PCI_DEVICE_ID_INTEL_82424 0x0483