Attachment 114657 Details for Bug 214931

[patch] This patch breaks some VIA system

via-fix-broken-patch.diff (text/plain), 24.66 KB, created by Takashi Iwai on 2007-01-24 13:41:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2007-01-24 13:41:49 UTC

Size: 24.66 KB

patch

obsolete

>PCI: Fix multiple problems with VIA hardware
>
>This patch is designed to fix:
>- Disk eating corruptor on KT7 after resume from RAM
>- VIA IRQ handling
>- VIA fixups for bus lockups after resume from RAM
>
>The core of this is to add a table of resume fixups run at resume time.
>We need to do this for a variety of boards and features, but particularly
>we need to do this to get various critical VIA fixups done on resume.
>
>The second part of the problem is to handle VIA IRQ number rules which
>are a bit odd and need special handling for PIC interrupts. Various
>patches broke various boxes and while this one may not be perfect
>(hopefully it is) it ensures the workaround is applied to the right
>devices only.
>
>From: Jean Delvare <khali@linux-fr.org>
>
>Now that PCI quirks are replayed on software resume, we can safely
>re-enable the Asus SMBus unhiding quirk even when software suspend support
>is enabled.
>
>[akpm@osdl.org: fix const warning]
>Signed-off-by: Alan Cox <alan@redhat.com>
>Cc: Jean Delvare <khali@linux-fr.org>
>Signed-off-by: Andrew Morton <akpm@osdl.org>
>Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>
>
>---
>commit 1597cacbe39802d86656d1f2e6329895bd2ef531
>tree 23036b221b31f154118582af7dbc5cd35fc97bc8
>parent beb7cc8238a8334d86c96bf32bf66182db3b619f
>author Alan Cox <alan@lxorguk.ukuu.org.uk> Mon, 04 Dec 2006 15:14:45 -0800
>committer Greg Kroah-Hartman <gregkh@suse.de> Wed, 20 Dec 2006 10:54:43 -0800
>
> arch/i386/pci/fixup.c             |   13 ++-
> drivers/pci/pci-driver.c          |    2 
> drivers/pci/quirks.c              |  167 ++++++++++++++++++++++++-------------
> drivers/pci/search.c              |    3 -
> include/asm-generic/vmlinux.lds.h |    3 +
> include/linux/pci.h               |   19 ++++
> 6 files changed, 144 insertions(+), 63 deletions(-)
>
>diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
>index cde1170..8053b17 100644
>--- a/arch/i386/pci/fixup.c
>+++ b/arch/i386/pci/fixup.c
>@@ -115,7 +115,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
> #define VIA_8363_KL133_REVISION_ID 0x81
> #define VIA_8363_KM133_REVISION_ID 0x84
> 
>-static void __devinit pci_fixup_via_northbridge_bug(struct pci_dev *d)
>+static void pci_fixup_via_northbridge_bug(struct pci_dev *d)
> {
> 	u8 v;
> 	u8 revision;
>@@ -151,6 +151,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_V
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug);
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug);
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, pci_fixup_via_northbridge_bug);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8622, pci_fixup_via_northbridge_bug);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8361, pci_fixup_via_northbridge_bug);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8367_0, pci_fixup_via_northbridge_bug);
> 
> /*
>  * For some reasons Intel decided that certain parts of their
>@@ -181,7 +185,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
>  * issue another HALT within 80 ns of the initial HALT, the failure condition
>  * is avoided.
>  */
>-static void __init pci_fixup_nforce2(struct pci_dev *dev)
>+static void pci_fixup_nforce2(struct pci_dev *dev)
> {
> 	u32 val;
> 
>@@ -204,6 +208,7 @@ static void __init pci_fixup_nforce2(str
> 	}
> }
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci_fixup_nforce2);
> 
> /* Max PCI Express root ports */
> #define MAX_PCIEROOT	6
>@@ -419,7 +424,7 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_T
>  * Prevent the BIOS trapping accesses to the Cyrix CS5530A video device
>  * configuration space.
>  */
>-static void __devinit pci_early_fixup_cyrix_5530(struct pci_dev *dev)
>+static void pci_early_fixup_cyrix_5530(struct pci_dev *dev)
> {
> 	u8 r;
> 	/* clear 'F4 Video Configuration Trap' bit */
>@@ -429,3 +434,5 @@ static void __devinit pci_early_fixup_cy
> }
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,
> 			pci_early_fixup_cyrix_5530);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,
>+			pci_early_fixup_cyrix_5530);
>diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
>index de5b901..b8d2385 100644
>--- a/drivers/pci/pci-driver.c
>+++ b/drivers/pci/pci-driver.c
>@@ -353,6 +353,8 @@ static int pci_device_resume_early(struc
> 	struct pci_dev * pci_dev = to_pci_dev(dev);
> 	struct pci_driver * drv = pci_dev->driver;
> 
>+	pci_fixup_device(pci_fixup_resume, pci_dev);
>+
> 	if (drv && drv->resume_early)
> 		error = drv->resume_early(pci_dev);
> 	return error;
>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
>index cf3e7c0..30c41fc 100644
>--- a/drivers/pci/quirks.c
>+++ b/drivers/pci/quirks.c
>@@ -36,7 +36,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ME
> 
> /* Deal with broken BIOS'es that neglect to enable passive release,
>    which can cause problems in combination with the 82441FX/PPro MTRRs */
>-static void __devinit quirk_passive_release(struct pci_dev *dev)
>+static void quirk_passive_release(struct pci_dev *dev)
> {
> 	struct pci_dev *d = NULL;
> 	unsigned char dlc;
>@@ -53,6 +53,7 @@ static void __devinit quirk_passive_rele
> 	}
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82441,	quirk_passive_release );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82441,	quirk_passive_release );
> 
> /*  The VIA VP2/VP3/MVP3 seem to have some 'features'. There may be a workaround
>     but VIA don't answer queries. If you happen to have good contacts at VIA
>@@ -134,7 +135,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
>  *	Updated based on further information from the site and also on
>  *	information provided by VIA 
>  */
>-static void __devinit quirk_vialatency(struct pci_dev *dev)
>+static void quirk_vialatency(struct pci_dev *dev)
> {
> 	struct pci_dev *p;
> 	u8 rev;
>@@ -185,6 +186,10 @@ exit:
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8363_0,	quirk_vialatency );
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8371_1,	quirk_vialatency );
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8361,		quirk_vialatency );
>+/* Must restore this on a resume from RAM */
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8363_0,	quirk_vialatency );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8371_1,	quirk_vialatency );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8361,		quirk_vialatency );
> 
> /*
>  *	VIA Apollo VP3 needs ETBF on BT848/878
>@@ -532,7 +537,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_V
>  * TODO: When we have device-specific interrupt routers,
>  * this code will go away from quirks.
>  */
>-static void __devinit quirk_via_ioapic(struct pci_dev *dev)
>+static void quirk_via_ioapic(struct pci_dev *dev)
> {
> 	u8 tmp;
> 	
>@@ -548,6 +553,7 @@ static void __devinit quirk_via_ioapic(s
> 	pci_write_config_byte (dev, 0x58, tmp);
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686,	quirk_via_ioapic );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686,	quirk_via_ioapic );
> 
> /*
>  * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
>@@ -555,7 +561,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VI
>  * Set this bit to get rid of cycle wastage.
>  * Otherwise uncritical.
>  */
>-static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
>+static void quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
> {
> 	u8 misc_control2;
> #define BYPASS_APIC_DEASSERT 8
>@@ -567,6 +573,7 @@ static void __devinit quirk_via_vt8237_b
> 	}
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8237,		quirk_via_vt8237_bypass_apic_deassert);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8237,		quirk_via_vt8237_bypass_apic_deassert);
> 
> /*
>  * The AMD io apic can hang the box when an apic irq is masked.
>@@ -600,7 +607,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI
> #define AMD8131_revB0        0x11
> #define AMD8131_MISC         0x40
> #define AMD8131_NIOAMODE_BIT 0
>-static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) 
>+static void quirk_amd_8131_ioapic(struct pci_dev *dev)
> { 
>         unsigned char revid, tmp;
>         
>@@ -616,6 +623,7 @@ static void __init quirk_amd_8131_ioapic
>         }
> } 
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
> #endif /* CONFIG_X86_IO_APIC */
> 
> 
>@@ -641,65 +649,84 @@ static void __devinit quirk_via_acpi(str
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C586_3,	quirk_via_acpi );
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686_4,	quirk_via_acpi );
> 
>-/*
>- * 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.
>- *
>- * Some of the on-chip devices are actually '586 devices' so they are
>- * listed here.
>- */
>-
>-static int via_irq_fixup_needed = -1;
> 
> /*
>- * As some VIA hardware is available in PCI-card form, we need to restrict
>- * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
>- * We try to locate a VIA southbridge before deciding whether the quirk
>- * should be applied.
>+ *	VIA bridges which have VLink
>  */
>-static const struct pci_device_id via_irq_fixup_tbl[] = {
>-	{
>-		.vendor 	= PCI_VENDOR_ID_VIA,
>-		.device		= PCI_ANY_ID,
>-		.subvendor	= PCI_ANY_ID,
>-		.subdevice	= PCI_ANY_ID,
>-		.class		= PCI_CLASS_BRIDGE_ISA << 8,
>-		.class_mask	= 0xffff00,
>-	},
>+
>+static const struct pci_device_id via_vlink_fixup_tbl[] = {
>+	/* Internal devices need IRQ line routing, pre VLink */
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686), 0 },
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8231), 17 },
>+	/* Devices with VLink */
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_0), 17},
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233A), 17 },
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233C_0), 17 },
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8235), 16 },
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237), 15 },
>+	{ PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237A), 15 },
> 	{ 0, },
> };
> 
>-static void quirk_via_irq(struct pci_dev *dev)
>+/**
>+ *	quirk_via_vlink		-	VIA VLink IRQ number update
>+ *	@dev: PCI device
>+ *
>+ *	If the device we are dealing with is on a PIC IRQ we need to
>+ *	ensure that the IRQ line register which usually is not relevant
>+ *	for PCI cards, is actually written so that interrupts get sent
>+ *	to the right place
>+ */
>+
>+static void quirk_via_vlink(struct pci_dev *dev)
> {
>+	const struct pci_device_id *via_vlink_fixup;
>+	static int dev_lo = -1, dev_hi = 18;
> 	u8 irq, new_irq;
> 
>-	if (via_irq_fixup_needed == -1)
>-		via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
>+	/* Check if we have VLink and cache the result */
> 
>-	if (!via_irq_fixup_needed)
>+	/* Checked already - no */
>+	if (dev_lo == -2)
> 		return;
> 
>+	/* Not checked - see what bridge we have and find the device
>+	   ranges */
>+
>+	if (dev_lo == -1) {
>+		via_vlink_fixup = pci_find_present(via_vlink_fixup_tbl);
>+		if (via_vlink_fixup == NULL) {
>+			dev_lo = -2;
>+			return;
>+		}
>+		dev_lo = via_vlink_fixup->driver_data;
>+		/* 82C686 is special - 0/0 */
>+		if (dev_lo == 0)
>+			dev_hi = 0;
>+	}
> 	new_irq = dev->irq;
> 
> 	/* Don't quirk interrupts outside the legacy IRQ range */
> 	if (!new_irq || new_irq > 15)
> 		return;
> 
>+	/* Internal device ? */
>+	if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) > dev_hi ||
>+		PCI_SLOT(dev->devfn) < dev_lo)
>+		return;
>+
>+	/* This is an internal VLink device on a PIC interrupt. The BIOS
>+	   ought to have set this but may not have, so we redo it */
>+
> 	pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
> 	if (new_irq != irq) {
>-		printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n",
>+		printk(KERN_INFO "PCI: VIA VLink IRQ fixup for %s, from %d to %d\n",
> 			pci_name(dev), irq, new_irq);
> 		udelay(15);	/* unknown if delay really needed */
> 		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
> 	}
> }
>-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
>+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_vlink);
> 
> /*
>  * VIA VT82C598 has its device ID settable and many BIOSes
>@@ -720,13 +747,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_V
>  * do this even if the Linux CardBus driver is not loaded, because
>  * the Linux i82365 driver does not (and should not) handle CardBus.
>  */
>-static void __devinit quirk_cardbus_legacy(struct pci_dev *dev)
>+static void quirk_cardbus_legacy(struct pci_dev *dev)
> {
> 	if ((PCI_CLASS_BRIDGE_CARDBUS << 8) ^ dev->class)
> 		return;
> 	pci_write_config_dword(dev, PCI_CB_LEGACY_MODE_BASE, 0);
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
>+DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
> 
> /*
>  * Following the PCI ordering rules is optional on the AMD762. I'm not
>@@ -735,7 +763,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_
>  * To be fair to AMD, it follows the spec by default, its BIOS people
>  * who turn it off!
>  */
>-static void __devinit quirk_amd_ordering(struct pci_dev *dev)
>+static void quirk_amd_ordering(struct pci_dev *dev)
> {
> 	u32 pcic;
> 	pci_read_config_dword(dev, 0x4C, &pcic);
>@@ -749,6 +777,7 @@ static void __devinit quirk_amd_ordering
> 	}
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
> 
> /*
>  *	DreamWorks provided workaround for Dunord I-3000 problem
>@@ -784,7 +813,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_T
>  * datasheets found at http://www.national.com/ds/GX for info on what
>  * these bits do.  <christer@weinigel.se>
>  */
>-static void __init quirk_mediagx_master(struct pci_dev *dev)
>+static void quirk_mediagx_master(struct pci_dev *dev)
> {
> 	u8 reg;
> 	pci_read_config_byte(dev, 0x41, &reg);
>@@ -795,13 +824,14 @@ static void __init quirk_mediagx_master(
> 	}
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX,	PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX,	PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
> 
> /*
>  *	Ensure C0 rev restreaming is off. This is normally done by
>  *	the BIOS but in the odd case it is not the results are corruption
>  *	hence the presence of a Linux check
>  */
>-static void __init quirk_disable_pxb(struct pci_dev *pdev)
>+static void quirk_disable_pxb(struct pci_dev *pdev)
> {
> 	u16 config;
> 	u8 rev;
>@@ -817,6 +847,7 @@ static void __init quirk_disable_pxb(str
> 	}
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82454NX,	quirk_disable_pxb );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82454NX,	quirk_disable_pxb );
> 
> 
> /*
>@@ -874,7 +905,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
>  * runs everywhere at present we suppress the printk output in most
>  * irrelevant cases.
>  */
>-static void __init k8t_sound_hostbridge(struct pci_dev *dev)
>+static void k8t_sound_hostbridge(struct pci_dev *dev)
> {
> 	unsigned char val;
> 
>@@ -893,8 +924,8 @@ static void __init k8t_sound_hostbridge(
> 	}
> }
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
> 
>-#ifndef CONFIG_ACPI_SLEEP
> /*
>  * On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge
>  * is not activated. The myth is that Asus said that they do not want the
>@@ -906,10 +937,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_V
>  * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 
>  * becomes necessary to do this tweak in two steps -- I've chosen the Host
>  * bridge as trigger.
>- *
>- * Actually, leaving it unhidden and not redoing the quirk over suspend2ram
>- * will cause thermal management to break down, and causing machine to
>- * overheat.
>  */
> static int __initdata asus_hides_smbus;
> 
>@@ -1019,7 +1046,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855GM_HB,	asus_hides_smbus_hostbridge );
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );
> 
>-static void __init asus_hides_smbus_lpc(struct pci_dev *dev)
>+static void asus_hides_smbus_lpc(struct pci_dev *dev)
> {
> 	u16 val;
> 	
>@@ -1042,8 +1069,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_12,	asus_hides_smbus_lpc );
> 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 );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_0,	asus_hides_smbus_lpc );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801BA_0,	asus_hides_smbus_lpc );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asus_hides_smbus_lpc );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_12,	asus_hides_smbus_lpc );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801DB_12,	asus_hides_smbus_lpc );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801EB_0,	asus_hides_smbus_lpc );
> 
>-static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
>+static void asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
> {
> 	u32 val, rcba;
> 	void __iomem *base;
>@@ -1059,13 +1092,12 @@ static void __init asus_hides_smbus_lpc_
> 	printk(KERN_INFO "PCI: Enabled ICH6/i801 SMBus device\n");
> }
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH6_1,	asus_hides_smbus_lpc_ich6 );
>-
>-#endif
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ICH6_1,	asus_hides_smbus_lpc_ich6 );
> 
> /*
>  * SiS 96x south bridge: BIOS typically hides SMBus device...
>  */
>-static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
>+static void quirk_sis_96x_smbus(struct pci_dev *dev)
> {
> 	u8 val = 0;
> 	printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
>@@ -1086,7 +1118,7 @@ static int __devinitdata sis_96x_compati
> 
> #define SIS_DETECT_REGISTER 0x40
> 
>-static void __init quirk_sis_503(struct pci_dev *dev)
>+static void quirk_sis_503(struct pci_dev *dev)
> {
> 	u8 reg;
> 	u16 devid;
>@@ -1122,13 +1154,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_735,		quirk_sis_96x_compatible );
> 
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_503,		quirk_sis_503 );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_503,		quirk_sis_503 );
> /*
>  * On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
>  * and MC97 modem controller are disabled when a second PCI soundcard is
>  * present. This patch, tweaking the VT8237 ISA bridge, enables them.
>  * -- bjd
>  */
>-static void __init asus_hides_ac97_lpc(struct pci_dev *dev)
>+static void asus_hides_ac97_lpc(struct pci_dev *dev)
> {
> 	u8 val;
> 	int asus_hides_ac97 = 0;
>@@ -1159,6 +1192,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );
> DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );
> 
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc );
>+
>+
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_961,		quirk_sis_96x_smbus );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_962,		quirk_sis_96x_smbus );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );
>+
> #if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
> 
> /*
>@@ -1167,7 +1208,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
>  *	the PCI scanning.
>  */
> 
>-static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)
>+static void quirk_jmicron_dualfn(struct pci_dev *pdev)
> {
> 	u32 conf;
> 	u8 hdr;
>@@ -1205,6 +1246,7 @@ static void __devinit quirk_jmicron_dual
> }
> 
> DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
> 
> #endif
> 
>@@ -1532,6 +1574,8 @@ extern struct pci_fixup __start_pci_fixu
> extern struct pci_fixup __end_pci_fixups_final[];
> extern struct pci_fixup __start_pci_fixups_enable[];
> extern struct pci_fixup __end_pci_fixups_enable[];
>+extern struct pci_fixup __start_pci_fixups_resume[];
>+extern struct pci_fixup __end_pci_fixups_resume[];
> 
> 
> void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
>@@ -1559,6 +1603,11 @@ void pci_fixup_device(enum pci_fixup_pas
> 		end = __end_pci_fixups_enable;
> 		break;
> 
>+	case pci_fixup_resume:
>+		start = __start_pci_fixups_resume;
>+		end = __end_pci_fixups_resume;
>+		break;
>+
> 	default:
> 		/* stupid compiler warning, you would think with an enum... */
> 		return;
>@@ -1596,7 +1645,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
>  * Force it to be linked by setting the corresponding control bit in the
>  * config space.
>  */
>-static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
>+static void quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
> {
> 	uint8_t b;
> 	if (pci_read_config_byte(dev, 0xf41, &b) == 0) {
>@@ -1610,6 +1659,8 @@ static void __devinit quirk_nvidia_ck804
> }
> DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
> 			quirk_nvidia_ck804_pcie_aer_ext_cap);
>+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
>+			quirk_nvidia_ck804_pcie_aer_ext_cap);
> 
> #ifdef CONFIG_PCI_MSI
> /* To disable MSI globally */
>diff --git a/drivers/pci/search.c b/drivers/pci/search.c
>index 2bbafe0..45f2b20 100644
>--- a/drivers/pci/search.c
>+++ b/drivers/pci/search.c
>@@ -416,7 +416,7 @@ exit:
> const struct pci_device_id *pci_find_present(const struct pci_device_id *ids)
> {
> 	struct pci_dev *dev;
>-	struct pci_device_id * found = NULL;
>+	const struct pci_device_id *found = NULL;
> 
> 	WARN_ON(in_interrupt());
> 	down_read(&pci_bus_sem);
>@@ -442,7 +442,6 @@ const struct pci_device_id *pci_find_pre
>  * find devices that are usually built into a system, or for a general hint as
>  * to if another device happens to be present at this specific moment in time.
>  */
>-
> int pci_dev_present(const struct pci_device_id *ids)
> {
> 	return pci_find_present(ids) == NULL ? 0 : 1;
>diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
>index 1587121..9fcc8d9 100644
>--- a/include/asm-generic/vmlinux.lds.h
>+++ b/include/asm-generic/vmlinux.lds.h
>@@ -35,6 +35,9 @@
> 		VMLINUX_SYMBOL(__start_pci_fixups_enable) = .;		\
> 		*(.pci_fixup_enable)					\
> 		VMLINUX_SYMBOL(__end_pci_fixups_enable) = .;		\
>+		VMLINUX_SYMBOL(__start_pci_fixups_resume) = .;		\
>+		*(.pci_fixup_resume)					\
>+		VMLINUX_SYMBOL(__end_pci_fixups_resume) = .;		\
> 	}								\
> 									\
> 	/* RapidIO route ops */						\
>diff --git a/include/linux/pci.h b/include/linux/pci.h
>index b20ffb6..c1a2bc8 100644
>--- a/include/linux/pci.h
>+++ b/include/linux/pci.h
>@@ -396,6 +396,21 @@ struct pci_driver {
>  */
> #define pci_module_init	pci_register_driver
> 
>+/**
>+ * PCI_VDEVICE - macro used to describe a specific pci device in short form
>+ * @vend: the vendor name
>+ * @dev: the 16 bit PCI Device ID
>+ *
>+ * This macro is used to create a struct pci_device_id that matches a
>+ * specific PCI device.  The subvendor, and subdevice fields will be set
>+ * to PCI_ANY_ID. The macro allows the next field to follow as the device
>+ * private data.
>+ */
>+
>+#define PCI_VDEVICE(vendor, device)		\
>+	PCI_VENDOR_ID_##vendor, (device),	\
>+	PCI_ANY_ID, PCI_ANY_ID, 0, 0
>+
> /* these external functions are only available when PCI support is enabled */
> #ifdef CONFIG_PCI
> 
>@@ -787,6 +802,7 @@ enum pci_fixup_pass {
> 	pci_fixup_header,	/* After reading configuration header */
> 	pci_fixup_final,	/* Final phase of device fixups */
> 	pci_fixup_enable,	/* pci_enable_device() time */
>+	pci_fixup_resume,	/* pci_enable_device() time */
> };
> 
> /* Anonymous variables would be nice... */
>@@ -805,6 +821,9 @@ enum pci_fixup_pass {
> #define DECLARE_PCI_FIXUP_ENABLE(vendor, device, hook)			\
> 	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_enable,			\
> 			vendor##device##hook, vendor, device, hook)
>+#define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook)			\
>+	DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,			\
>+			resume##vendor##device##hook, vendor, device, hook)
> 
> 
> void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);

Actions: View | Diff

Attachments on bug 214931: 102582 | 102588 | 114657 | 114809 | 115902 | 116115 | 116184