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

Commit bb63b421 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86 pci: remove checking type for mmconfig probe 



doesn't need to check if it is type1 or type2, we can use raw_pci_ops
directly.

also make pci_direct_conf1 static again.

anyway is there system with type 2 and mmconf support?

Signed-off-by: default avatarYinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d2ebdf4b

arch/x86/pci/direct.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -258,7 +258,8 @@ void __init pci_direct_init(int type) 
{

{

	if (type == 0)

	if (type == 0)

		return;

		return;

	printk(KERN_INFO "PCI: Using configuration type %d\n", type);

	printk(KERN_INFO "PCI: Using configuration type %d for base access\n",

		 type);

	if (type == 1)

	if (type == 1)

		raw_pci_ops = &pci_direct_conf1;

		raw_pci_ops = &pci_direct_conf1;

	else

	else
@@ -275,8 +276,10 @@ int __init pci_direct_probe(void) 
	if (!region)

	if (!region)

		goto type2;

		goto type2;





	if (pci_check_type1())

	if (pci_check_type1()) {

		raw_pci_ops = &pci_direct_conf1;

		return 1;

		return 1;

	}

	release_resource(region);

	release_resource(region);





 type2:

 type2:
@@ -290,7 +293,6 @@ int __init pci_direct_probe(void) 
		goto fail2;

		goto fail2;





	if (pci_check_type2()) {

	if (pci_check_type2()) {

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

		raw_pci_ops = &pci_direct_conf2;

		raw_pci_ops = &pci_direct_conf2;

		return 2;

		return 2;

	}

	}

arch/x86/pci/init.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -6,14 +6,13 @@ 
   in the right sequence from here. */

   in the right sequence from here. */

static __init int pci_access_init(void)

static __init int pci_access_init(void)

{

{

	int type __maybe_unused = 0;



#ifdef CONFIG_PCI_DIRECT

#ifdef CONFIG_PCI_DIRECT

	int type = 0;



	type = pci_direct_probe();

	type = pci_direct_probe();

#endif

#endif

	pci_mmcfg_early_init(type);

	pci_mmcfg_early_init();

	if (raw_pci_ops)



		return 0;

#ifdef CONFIG_PCI_BIOS

#ifdef CONFIG_PCI_BIOS

	pci_pcbios_init();

	pci_pcbios_init();

#endif

#endif
@@ -26,7 +25,7 @@ static __init int pci_access_init(void) 
#ifdef CONFIG_PCI_DIRECT

#ifdef CONFIG_PCI_DIRECT

	pci_direct_init(type);

	pci_direct_init(type);

#endif

#endif

	if (!raw_pci_ops)

	if (!raw_pci_ops && !raw_pci_ext_ops)

		printk(KERN_ERR

		printk(KERN_ERR

		"PCI: Fatal: No config space access function found\n");

		"PCI: Fatal: No config space access function found\n");

arch/x86/pci/mmconfig-shared.c

+15 −17
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ static int __initdata pci_mmcfg_resources_inserted; 
static const char __init *pci_mmcfg_e7520(void)

static const char __init *pci_mmcfg_e7520(void)

{

{

	u32 win;

	u32 win;

	pci_direct_conf1.read(0, 0, PCI_DEVFN(0,0), 0xce, 2, &win);

	raw_pci_ops->read(0, 0, PCI_DEVFN(0, 0), 0xce, 2, &win);





	win = win & 0xf000;

	win = win & 0xf000;

	if(win == 0x0000 || win == 0xf000)

	if(win == 0x0000 || win == 0xf000)
@@ -53,7 +53,7 @@ static const char __init *pci_mmcfg_intel_945(void) 




	pci_mmcfg_config_num = 1;

	pci_mmcfg_config_num = 1;





	pci_direct_conf1.read(0, 0, PCI_DEVFN(0,0), 0x48, 4, &pciexbar);

	raw_pci_ops->read(0, 0, PCI_DEVFN(0, 0), 0x48, 4, &pciexbar);





	/* Enable bit */

	/* Enable bit */

	if (!(pciexbar & 1))

	if (!(pciexbar & 1))
@@ -179,6 +179,9 @@ static int __init pci_mmcfg_check_hostbridge(void) 
	int i;

	int i;

	const char *name;

	const char *name;





	if (!raw_pci_ops)

		return 0;



	pci_mmcfg_config_num = 0;

	pci_mmcfg_config_num = 0;

	pci_mmcfg_config = NULL;

	pci_mmcfg_config = NULL;

	name = NULL;

	name = NULL;
@@ -186,7 +189,7 @@ static int __init pci_mmcfg_check_hostbridge(void) 
	for (i = 0; !name && i < ARRAY_SIZE(pci_mmcfg_probes); i++) {

	for (i = 0; !name && i < ARRAY_SIZE(pci_mmcfg_probes); i++) {

		bus =  pci_mmcfg_probes[i].bus;

		bus =  pci_mmcfg_probes[i].bus;

		devfn = pci_mmcfg_probes[i].devfn;

		devfn = pci_mmcfg_probes[i].devfn;

		pci_direct_conf1.read(0, bus, devfn, 0, 4, &l);

		raw_pci_ops->read(0, bus, devfn, 0, 4, &l);

		vendor = l & 0xffff;

		vendor = l & 0xffff;

		device = (l >> 16) & 0xffff;

		device = (l >> 16) & 0xffff;
@@ -304,7 +307,7 @@ static int __init is_acpi_reserved(unsigned long start, unsigned long end) 
	return mcfg_res.flags;

	return mcfg_res.flags;

}

}





static void __init pci_mmcfg_reject_broken(int type, int early)

static void __init pci_mmcfg_reject_broken(int early)

{

{

	typeof(pci_mmcfg_config[0]) *cfg;

	typeof(pci_mmcfg_config[0]) *cfg;

	int i;

	int i;
@@ -342,8 +345,8 @@ static void __init pci_mmcfg_reject_broken(int type, int early) 
			       " reserved in ACPI motherboard resources\n",

			       " reserved in ACPI motherboard resources\n",

			       cfg->address);

			       cfg->address);

		/* Don't try to do this check unless configuration

		/* Don't try to do this check unless configuration

		   type 1 is available. */

		   type 1 is available. how about type 2 ?*/

		if (type == 1 && e820_all_mapped(cfg->address,

		if (raw_pci_ops && e820_all_mapped(cfg->address,

						  cfg->address + size - 1,

						  cfg->address + size - 1,

						  E820_RESERVED)) {

						  E820_RESERVED)) {

			printk(KERN_NOTICE

			printk(KERN_NOTICE
@@ -368,7 +371,7 @@ reject: 




static int __initdata known_bridge;

static int __initdata known_bridge;





void __init __pci_mmcfg_init(int type, int early)

void __init __pci_mmcfg_init(int early)

{

{

	/* MMCONFIG disabled */

	/* MMCONFIG disabled */

	if ((pci_probe & PCI_PROBE_MMCONF) == 0)

	if ((pci_probe & PCI_PROBE_MMCONF) == 0)
@@ -382,14 +385,14 @@ void __init __pci_mmcfg_init(int type, int early) 
	if (known_bridge)

	if (known_bridge)

		return;

		return;





	if (early && type == 1) {

	if (early) {

		if (pci_mmcfg_check_hostbridge())

		if (pci_mmcfg_check_hostbridge())

			known_bridge = 1;

			known_bridge = 1;

	}

	}





	if (!known_bridge) {

	if (!known_bridge) {

		acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);

		acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);

		pci_mmcfg_reject_broken(type, early);

		pci_mmcfg_reject_broken(early);

	}

	}





	if ((pci_mmcfg_config_num == 0) ||

	if ((pci_mmcfg_config_num == 0) ||
@@ -410,19 +413,14 @@ void __init __pci_mmcfg_init(int type, int early) 
	}

	}

}

}





void __init pci_mmcfg_early_init(int type)

void __init pci_mmcfg_early_init(void)

{

{

	__pci_mmcfg_init(type, 1);

	__pci_mmcfg_init(1);

}

}





void __init pci_mmcfg_late_init(void)

void __init pci_mmcfg_late_init(void)

{

{

	int type = 0;

	__pci_mmcfg_init(0);



	if (pci_probe & PCI_PROBE_CONF1)

		type = 1;



	__pci_mmcfg_init(type, 0);

}

}





static int __init pci_mmcfg_late_insert_resources(void)

static int __init pci_mmcfg_late_insert_resources(void)

include/linux/pci.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -1055,10 +1055,10 @@ extern unsigned long pci_cardbus_mem_size; 
extern int pcibios_add_platform_entries(struct pci_dev *dev);

extern int pcibios_add_platform_entries(struct pci_dev *dev);





#ifdef CONFIG_PCI_MMCONFIG

#ifdef CONFIG_PCI_MMCONFIG

extern void __init pci_mmcfg_early_init(int type);

extern void __init pci_mmcfg_early_init(void);

extern void __init pci_mmcfg_late_init(void);

extern void __init pci_mmcfg_late_init(void);

#else

#else

static inline void pci_mmcfg_early_init(int type) { }

static inline void pci_mmcfg_early_init(void) { }

static inline void pci_mmcfg_late_init(void) { }

static inline void pci_mmcfg_late_init(void) { }

#endif

#endif