Skip to content

L
linux
Commit 96cf7c73 authored by Jung-Ik Lee's avatar Jung-Ik Lee Committed by Russell King
Browse files
Options

[PATCH] Patch: 2.5.45 PCI Fixups for PCI HotPlug 

The following patch changes function scopes only but fixes kernel dump on
Hot-Add of PCI bridge cards.
parent 0aabd43d
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
arch/i386/pci/fixup.c
View file @ 96cf7c73
...@@ -138,7 +138,7 @@ static void __devinit pci_fixup_piix4_acpi(struct pci_dev *d) ...@@ -138,7 +138,7 @@ static void __devinit pci_fixup_piix4_acpi(struct pci_dev *d)
#define VIA_8363_KL133_REVISION_ID 0x81 #define VIA_8363_KL133_REVISION_ID 0x81
#define VIA_8363_KM133_REVISION_ID 0x84 #define VIA_8363_KM133_REVISION_ID 0x84
static void __init pci_fixup_via_northbridge_bug(struct pci_dev *d) static void __devinit pci_fixup_via_northbridge_bug(struct pci_dev *d)
{ {
u8 v; u8 v;
u8 revision; u8 revision;
...@@ -180,7 +180,7 @@ static void __init pci_fixup_via_northbridge_bug(struct pci_dev *d) ...@@ -180,7 +180,7 @@ static void __init pci_fixup_via_northbridge_bug(struct pci_dev *d)
* system to PCI bus no matter what are their window settings, so they are * system to PCI bus no matter what are their window settings, so they are
* "transparent" (or subtractive decoding) from programmers point of view. * "transparent" (or subtractive decoding) from programmers point of view.
*/ */
static void __init pci_fixup_transparent_bridge(struct pci_dev *dev) static void __devinit pci_fixup_transparent_bridge(struct pci_dev *dev)
{ {
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
(dev->device & 0xff00) == 0x2400) (dev->device & 0xff00) == 0x2400)
......
drivers/pci/quirks.c
View file @ 96cf7c73
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
/* Deal with broken BIOS'es that neglect to enable passive release, /* Deal with broken BIOS'es that neglect to enable passive release,
which can cause problems in combination with the 82441FX/PPro MTRRs */ which can cause problems in combination with the 82441FX/PPro MTRRs */
static void __init quirk_passive_release(struct pci_dev *dev) static void __devinit quirk_passive_release(struct pci_dev *dev)
{ {
struct pci_dev *d = NULL; struct pci_dev *d = NULL;
unsigned char dlc; unsigned char dlc;
...@@ -50,7 +50,7 @@ static void __init quirk_passive_release(struct pci_dev *dev) ...@@ -50,7 +50,7 @@ static void __init quirk_passive_release(struct pci_dev *dev)
int isa_dma_bridge_buggy; /* Exported */ int isa_dma_bridge_buggy; /* Exported */
static void __init quirk_isa_dma_hangs(struct pci_dev *dev) static void __devinit quirk_isa_dma_hangs(struct pci_dev *dev)
{ {
if (!isa_dma_bridge_buggy) { if (!isa_dma_bridge_buggy) {
isa_dma_bridge_buggy=1; isa_dma_bridge_buggy=1;
...@@ -64,7 +64,7 @@ int pci_pci_problems; ...@@ -64,7 +64,7 @@ int pci_pci_problems;
* Chipsets where PCI->PCI transfers vanish or hang * Chipsets where PCI->PCI transfers vanish or hang
*/ */
static void __init quirk_nopcipci(struct pci_dev *dev) static void __devinit quirk_nopcipci(struct pci_dev *dev)
{ {
if((pci_pci_problems&PCIPCI_FAIL)==0) if((pci_pci_problems&PCIPCI_FAIL)==0)
{ {
...@@ -77,7 +77,7 @@ static void __init quirk_nopcipci(struct pci_dev *dev) ...@@ -77,7 +77,7 @@ static void __init quirk_nopcipci(struct pci_dev *dev)
* Triton requires workarounds to be used by the drivers * Triton requires workarounds to be used by the drivers
*/ */
static void __init quirk_triton(struct pci_dev *dev) static void __devinit quirk_triton(struct pci_dev *dev)
{ {
if((pci_pci_problems&PCIPCI_TRITON)==0) if((pci_pci_problems&PCIPCI_TRITON)==0)
{ {
...@@ -96,7 +96,7 @@ static void __init quirk_triton(struct pci_dev *dev) ...@@ -96,7 +96,7 @@ static void __init quirk_triton(struct pci_dev *dev)
* Updated based on further information from the site and also on * Updated based on further information from the site and also on
* information provided by VIA * information provided by VIA
*/ */
static void __init quirk_vialatency(struct pci_dev *dev) static void __devinit quirk_vialatency(struct pci_dev *dev)
{ {
struct pci_dev *p; struct pci_dev *p;
u8 rev; u8 rev;
...@@ -150,7 +150,7 @@ static void __init quirk_vialatency(struct pci_dev *dev) ...@@ -150,7 +150,7 @@ static void __init quirk_vialatency(struct pci_dev *dev)
* VIA Apollo VP3 needs ETBF on BT848/878 * VIA Apollo VP3 needs ETBF on BT848/878
*/ */
static void __init quirk_viaetbf(struct pci_dev *dev) static void __devinit quirk_viaetbf(struct pci_dev *dev)
{ {
if((pci_pci_problems&PCIPCI_VIAETBF)==0) if((pci_pci_problems&PCIPCI_VIAETBF)==0)
{ {
...@@ -158,7 +158,7 @@ static void __init quirk_viaetbf(struct pci_dev *dev) ...@@ -158,7 +158,7 @@ static void __init quirk_viaetbf(struct pci_dev *dev)
pci_pci_problems|=PCIPCI_VIAETBF; pci_pci_problems|=PCIPCI_VIAETBF;
} }
} }
static void __init quirk_vsfx(struct pci_dev *dev) static void __devinit quirk_vsfx(struct pci_dev *dev)
{ {
if((pci_pci_problems&PCIPCI_VSFX)==0) if((pci_pci_problems&PCIPCI_VSFX)==0)
{ {
...@@ -173,7 +173,7 @@ static void __init quirk_vsfx(struct pci_dev *dev) ...@@ -173,7 +173,7 @@ static void __init quirk_vsfx(struct pci_dev *dev)
* at least * at least
*/ */
static void __init quirk_natoma(struct pci_dev *dev) static void __devinit quirk_natoma(struct pci_dev *dev)
{ {
if((pci_pci_problems&PCIPCI_NATOMA)==0) if((pci_pci_problems&PCIPCI_NATOMA)==0)
{ {
...@@ -187,7 +187,7 @@ static void __init quirk_natoma(struct pci_dev *dev) ...@@ -187,7 +187,7 @@ static void __init quirk_natoma(struct pci_dev *dev)
* If it's needed, re-allocate the region. * If it's needed, re-allocate the region.
*/ */
static void __init quirk_s3_64M(struct pci_dev *dev) static void __devinit quirk_s3_64M(struct pci_dev *dev)
{ {
struct resource *r = &dev->resource[0]; struct resource *r = &dev->resource[0];
...@@ -197,7 +197,7 @@ static void __init quirk_s3_64M(struct pci_dev *dev) ...@@ -197,7 +197,7 @@ static void __init quirk_s3_64M(struct pci_dev *dev)
} }
} }
static void __init quirk_io_region(struct pci_dev *dev, unsigned region, unsigned size, int nr) static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsigned size, int nr)
{ {
region &= ~(size-1); region &= ~(size-1);
if (region) { if (region) {
...@@ -222,7 +222,7 @@ static void __init quirk_io_region(struct pci_dev *dev, unsigned region, unsigne ...@@ -222,7 +222,7 @@ static void __init quirk_io_region(struct pci_dev *dev, unsigned region, unsigne
* 0xE0 (64 bytes of ACPI registers) * 0xE0 (64 bytes of ACPI registers)
* 0xE2 (32 bytes of SMB registers) * 0xE2 (32 bytes of SMB registers)
*/ */
static void __init quirk_ali7101_acpi(struct pci_dev *dev) static void __devinit quirk_ali7101_acpi(struct pci_dev *dev)
{ {
u16 region; u16 region;
...@@ -237,7 +237,7 @@ static void __init quirk_ali7101_acpi(struct pci_dev *dev) ...@@ -237,7 +237,7 @@ static void __init quirk_ali7101_acpi(struct pci_dev *dev)
* 0x40 (64 bytes of ACPI registers) * 0x40 (64 bytes of ACPI registers)
* 0x90 (32 bytes of SMB registers) * 0x90 (32 bytes of SMB registers)
*/ */
static void __init quirk_piix4_acpi(struct pci_dev *dev) static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
{ {
u32 region; u32 region;
...@@ -251,7 +251,7 @@ static void __init quirk_piix4_acpi(struct pci_dev *dev) ...@@ -251,7 +251,7 @@ static void __init quirk_piix4_acpi(struct pci_dev *dev)
* VIA ACPI: One IO region pointed to by longword at * VIA ACPI: One IO region pointed to by longword at
* 0x48 or 0x20 (256 bytes of ACPI registers) * 0x48 or 0x20 (256 bytes of ACPI registers)
*/ */
static void __init quirk_vt82c586_acpi(struct pci_dev *dev) static void __devinit quirk_vt82c586_acpi(struct pci_dev *dev)
{ {
u8 rev; u8 rev;
u32 region; u32 region;
...@@ -270,7 +270,7 @@ static void __init quirk_vt82c586_acpi(struct pci_dev *dev) ...@@ -270,7 +270,7 @@ static void __init quirk_vt82c586_acpi(struct pci_dev *dev)
* 0x70 (128 bytes of hardware monitoring register) * 0x70 (128 bytes of hardware monitoring register)
* 0x90 (16 bytes of SMB registers) * 0x90 (16 bytes of SMB registers)
*/ */
static void __init quirk_vt82c686_acpi(struct pci_dev *dev) static void __devinit quirk_vt82c686_acpi(struct pci_dev *dev)
{ {
u16 hm; u16 hm;
u32 smb; u32 smb;
...@@ -297,7 +297,7 @@ extern int nr_ioapics; ...@@ -297,7 +297,7 @@ extern int nr_ioapics;
* TODO: When we have device-specific interrupt routers, * TODO: When we have device-specific interrupt routers,
* this code will go away from quirks. * this code will go away from quirks.
*/ */
static void __init quirk_via_ioapic(struct pci_dev *dev) static void __devinit quirk_via_ioapic(struct pci_dev *dev)
{ {
u8 tmp; u8 tmp;
...@@ -338,7 +338,7 @@ static void __init quirk_via_ioapic(struct pci_dev *dev) ...@@ -338,7 +338,7 @@ static void __init quirk_via_ioapic(struct pci_dev *dev)
* value of the ACPI SCI interrupt is only done for convenience. * value of the ACPI SCI interrupt is only done for convenience.
* -jgarzik * -jgarzik
*/ */
static void __init quirk_via_acpi(struct pci_dev *d) static void __devinit quirk_via_acpi(struct pci_dev *d)
{ {
/* /*
* VIA ACPI device: SCI IRQ line in PCI config byte 0x42 * VIA ACPI device: SCI IRQ line in PCI config byte 0x42
...@@ -350,7 +350,7 @@ static void __init quirk_via_acpi(struct pci_dev *d) ...@@ -350,7 +350,7 @@ static void __init quirk_via_acpi(struct pci_dev *d)
d->irq = irq; d->irq = irq;
} }
static void __init quirk_via_irqpic(struct pci_dev *dev) static void __devinit quirk_via_irqpic(struct pci_dev *dev)
{ {
u8 irq, new_irq = dev->irq & 0xf; u8 irq, new_irq = dev->irq & 0xf;
...@@ -377,7 +377,7 @@ static void __init quirk_via_irqpic(struct pci_dev *dev) ...@@ -377,7 +377,7 @@ static void __init quirk_via_irqpic(struct pci_dev *dev)
* *
* We mask out all r/wc bits, too. * We mask out all r/wc bits, too.
*/ */
static void __init quirk_piix3_usb(struct pci_dev *dev) static void __devinit quirk_piix3_usb(struct pci_dev *dev)
{ {
u16 legsup; u16 legsup;
...@@ -392,7 +392,7 @@ static void __init quirk_piix3_usb(struct pci_dev *dev) ...@@ -392,7 +392,7 @@ static void __init quirk_piix3_usb(struct pci_dev *dev)
* We need to switch it off to be able to recognize the real * We need to switch it off to be able to recognize the real
* type of the chip. * type of the chip.
*/ */
static void __init quirk_vt82c598_id(struct pci_dev *dev) static void __devinit quirk_vt82c598_id(struct pci_dev *dev)
{ {
pci_write_config_byte(dev, 0xfc, 0); pci_write_config_byte(dev, 0xfc, 0);
pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device); pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device);
...@@ -404,7 +404,7 @@ static void __init quirk_vt82c598_id(struct pci_dev *dev) ...@@ -404,7 +404,7 @@ static void __init quirk_vt82c598_id(struct pci_dev *dev)
* do this even if the Linux CardBus driver is not loaded, because * do this even if the Linux CardBus driver is not loaded, because
* the Linux i82365 driver does not (and should not) handle CardBus. * the Linux i82365 driver does not (and should not) handle CardBus.
*/ */
static void __init quirk_cardbus_legacy(struct pci_dev *dev) static void __devinit quirk_cardbus_legacy(struct pci_dev *dev)
{ {
if ((PCI_CLASS_BRIDGE_CARDBUS << 8) ^ dev->class) if ((PCI_CLASS_BRIDGE_CARDBUS << 8) ^ dev->class)
return; return;
...@@ -421,7 +421,7 @@ static void __init quirk_cardbus_legacy(struct pci_dev *dev) ...@@ -421,7 +421,7 @@ static void __init quirk_cardbus_legacy(struct pci_dev *dev)
* of course. However the advice is demonstrably good even if so.. * of course. However the advice is demonstrably good even if so..
*/ */
static void __init quirk_amd_ioapic(struct pci_dev *dev) static void __devinit quirk_amd_ioapic(struct pci_dev *dev)
{ {
u8 rev; u8 rev;
...@@ -441,7 +441,7 @@ static void __init quirk_amd_ioapic(struct pci_dev *dev) ...@@ -441,7 +441,7 @@ static void __init quirk_amd_ioapic(struct pci_dev *dev)
* who turn it off! * who turn it off!
*/ */
static void __init quirk_amd_ordering(struct pci_dev *dev) static void __devinit quirk_amd_ordering(struct pci_dev *dev)
{ {
u32 pcic; u32 pcic;
pci_read_config_dword(dev, 0x4C, &pcic); pci_read_config_dword(dev, 0x4C, &pcic);
...@@ -464,14 +464,14 @@ static void __init quirk_amd_ordering(struct pci_dev *dev) ...@@ -464,14 +464,14 @@ static void __init quirk_amd_ordering(struct pci_dev *dev)
* nothing gets put too close to it. * nothing gets put too close to it.
*/ */
static void __init quirk_dunord ( struct pci_dev * dev ) static void __devinit quirk_dunord ( struct pci_dev * dev )
{ {
struct resource * r = & dev -> resource [ 1 ]; struct resource * r = & dev -> resource [ 1 ];
r -> start = 0; r -> start = 0;
r -> end = 0xffffff; r -> end = 0xffffff;
} }
static void __init quirk_transparent_bridge(struct pci_dev *dev) static void __devinit quirk_transparent_bridge(struct pci_dev *dev)
{ {
dev->transparent = 1; dev->transparent = 1;
} }
...@@ -480,7 +480,7 @@ static void __init quirk_transparent_bridge(struct pci_dev *dev) ...@@ -480,7 +480,7 @@ static void __init quirk_transparent_bridge(struct pci_dev *dev)
* The main table of quirks. * The main table of quirks.
*/ */
static struct pci_fixup pci_fixups[] __initdata = { static struct pci_fixup pci_fixups[] __devinitdata = {
{ PCI_FIXUP_HEADER, PCI_VENDOR_ID_DUNORD, PCI_DEVICE_ID_DUNORD_I3000, quirk_dunord }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_DUNORD, PCI_DEVICE_ID_DUNORD_I3000, quirk_dunord },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release }, { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release }, { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, quirk_passive_release },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7