Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c05fc1 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: Give PCI config access initialization a defined ordering 



I moved it to a separate function which is safer.

This avoids problems with the linker reordering them and the
less useful PCI config space access methods taking priority
over the better ones.

Fixes some problems with broken MMCONFIG

Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e4e73041

arch/i386/pci/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				:= i386.o

obj-y				:= i386.o init.o



obj-$(CONFIG_PCI_BIOS)		+= pcbios.o

obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o direct.o

arch/i386/pci/direct.c

+5 −10
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int __init pci_check_type2(void) 
	return works;

}



static int __init pci_direct_init(void)

void __init pci_direct_init(void)

{

	struct resource *region, *region2;
@@ -258,16 +258,16 @@ static int __init pci_direct_init(void) 
	if (pci_check_type1()) {

		printk(KERN_INFO "PCI: Using configuration type 1\n");

		raw_pci_ops = &pci_direct_conf1;

		return 0;

		return;

	}

	release_resource(region);



 type2:

	if ((pci_probe & PCI_PROBE_CONF2) == 0)

		goto out;

		return;

	region = request_region(0xCF8, 4, "PCI conf2");

	if (!region)

		goto out;

		return;

	region2 = request_region(0xC000, 0x1000, "PCI conf2");

	if (!region2)

		goto fail2;
@@ -275,15 +275,10 @@ static int __init pci_direct_init(void) 
	if (pci_check_type2()) {

		printk(KERN_INFO "PCI: Using configuration type 2\n");

		raw_pci_ops = &pci_direct_conf2;

		return 0;

		return;

	}



	release_resource(region2);

 fail2:

	release_resource(region);



 out:

	return 0;

}
 


arch_initcall(pci_direct_init);

arch/i386/pci/init.c

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#include <linux/config.h>

#include <linux/pci.h>

#include <linux/init.h>

#include "pci.h"



/* arch_initcall has too random ordering, so call the initializers

   in the right sequence from here. */

static __init int pci_access_init(void)

{

#ifdef CONFIG_PCI_MMCONFIG

	pci_mmcfg_init();

#endif

	if (raw_pci_ops)

		return 0;

#ifdef CONFIG_PCI_BIOS

	pci_pcbios_init();

#endif

	if (raw_pci_ops)

		return 0;

#ifdef CONFIG_PCI_DIRECT

	pci_direct_init();

#endif

	return 0;

}

arch_initcall(pci_access_init);

arch/i386/pci/mmconfig.c

+3 −8
Original line number Diff line number Diff line
@@ -172,25 +172,20 @@ static __init void unreachable_devices(void) 
	}

}



static int __init pci_mmcfg_init(void)

void __init pci_mmcfg_init(void)

{

	if ((pci_probe & PCI_PROBE_MMCONF) == 0)

		goto out;

		return;



	acpi_table_parse(ACPI_MCFG, acpi_parse_mcfg);

	if ((pci_mmcfg_config_num == 0) ||

	    (pci_mmcfg_config == NULL) ||

	    (pci_mmcfg_config[0].base_address == 0))

		goto out;

		return;



	printk(KERN_INFO "PCI: Using MMCONFIG\n");

	raw_pci_ops = &pci_mmcfg;

	pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;



	unreachable_devices();



 out:

	return 0;

}
 


arch_initcall(pci_mmcfg_init);

arch/i386/pci/pcbios.c

+1 −3
Original line number Diff line number Diff line
@@ -476,14 +476,12 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq) 
}

EXPORT_SYMBOL(pcibios_set_irq_routing);



static int __init pci_pcbios_init(void)

void __init pci_pcbios_init(void)

{

	if ((pci_probe & PCI_PROBE_BIOS) 

		&& ((raw_pci_ops = pci_find_bios()))) {

		pci_probe |= PCI_BIOS_SORT;

		pci_bios_present = 1;

	}

	return 0;

}

arch_initcall(pci_pcbios_init);