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

Commit 6a0668fc authored by Olivier Galibert's avatar Olivier Galibert Committed by Andi Kleen
Browse files

[PATCH] mmconfig: Reserve resources but only when we're sure about them. 



Put back the resource reservation as per
4c6e052a but use it *only* when the range(s)
come from a chipset probe instead of the bios.

Signed-off-by: default avatarOlivier Galibert <galibert@pobox.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 9358c693

arch/i386/pci/mmconfig-shared.c

+33 −0
Original line number Diff line number Diff line
@@ -166,6 +166,37 @@ static int __init pci_mmcfg_check_hostbridge(void) 
	return name != NULL;

}



static __init void pci_mmcfg_insert_resources(void)

{

#define PCI_MMCFG_RESOURCE_NAME_LEN 19

	int i;

	struct resource *res;

	char *names;

	unsigned num_buses;



	res = kcalloc(PCI_MMCFG_RESOURCE_NAME_LEN + sizeof(*res),

			pci_mmcfg_config_num, GFP_KERNEL);



	if (!res) {

		printk(KERN_ERR "PCI: Unable to allocate MMCONFIG resources\n");

		return;

	}



	names = (void *)&res[pci_mmcfg_config_num];

	for (i = 0; i < pci_mmcfg_config_num; i++, res++) {

		num_buses = pci_mmcfg_config[i].end_bus_number -

		    pci_mmcfg_config[i].start_bus_number + 1;

		res->name = names;

		snprintf(names, PCI_MMCFG_RESOURCE_NAME_LEN, "PCI MMCONFIG %u",

			pci_mmcfg_config[i].pci_segment);

		res->start = pci_mmcfg_config[i].address;

		res->end = res->start + (num_buses << 20) - 1;

		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;

		insert_resource(&iomem_resource, res);

		names += PCI_MMCFG_RESOURCE_NAME_LEN;

	}

}



void __init pci_mmcfg_init(int type)

{

	int known_bridge = 0;
@@ -199,6 +230,8 @@ void __init pci_mmcfg_init(int type) 
	if (pci_mmcfg_arch_init()) {

		if (type == 1)

			unreachable_devices();

		if (known_bridge)

			pci_mmcfg_insert_resources();

		pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;

	}

}