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

Put back the resource reservation as per 4c6e052adfe285ede5884e4e8c4d33af33932c13 but use it *only* when the range(s) come from a chipset probe instead of the bios. Signed-off-by: Olivier Galibert <galibert@pobox.com> Signed-off-by: Andi Kleen <ak@suse.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org>

[PATCH] mmconfig: Reserve resources but only when we're sure about them.
Put back the resource reservation as per 4c6e052adfe285ede5884e4e8c4d33af33932c13 but use it *only* when the range(s) come from a chipset probe instead of the bios. Signed-off-by: Olivier Galibert <galibert@pobox.com> Signed-off-by: Andi Kleen <ak@suse.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org>
Olivier Galibert · Andi Kleen
1 parent 9358c693c5
Showing 1 changed file with 33 additions and 0 deletions Side-by-side Diff
arch/i386/pci/mmconfig-shared.c
@@ -166,6 +166,37 @@
 	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 @@
 	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;
 	}
 }
...	...	@@ -166,6 +166,37 @@
166	166	return name != NULL;
167	167	}
168	168
	169	+static __init void pci_mmcfg_insert_resources(void)
	170	+{
	171	+#define PCI_MMCFG_RESOURCE_NAME_LEN 19
	172	+ int i;
	173	+ struct resource *res;
	174	+ char *names;
	175	+ unsigned num_buses;
	176	+
	177	+ res = kcalloc(PCI_MMCFG_RESOURCE_NAME_LEN + sizeof(*res),
	178	+ pci_mmcfg_config_num, GFP_KERNEL);
	179	+
	180	+ if (!res) {
	181	+ printk(KERN_ERR "PCI: Unable to allocate MMCONFIG resources\n");
	182	+ return;
	183	+ }
	184	+
	185	+ names = (void *)&res[pci_mmcfg_config_num];
	186	+ for (i = 0; i < pci_mmcfg_config_num; i++, res++) {
	187	+ num_buses = pci_mmcfg_config[i].end_bus_number -
	188	+ pci_mmcfg_config[i].start_bus_number + 1;
	189	+ res->name = names;
	190	+ snprintf(names, PCI_MMCFG_RESOURCE_NAME_LEN, "PCI MMCONFIG %u",
	191	+ pci_mmcfg_config[i].pci_segment);
	192	+ res->start = pci_mmcfg_config[i].address;
	193	+ res->end = res->start + (num_buses << 20) - 1;
	194	+ res->flags = IORESOURCE_MEM \| IORESOURCE_BUSY;
	195	+ insert_resource(&iomem_resource, res);
	196	+ names += PCI_MMCFG_RESOURCE_NAME_LEN;
	197	+ }
	198	+}
	199	+
169	200	void __init pci_mmcfg_init(int type)
170	201	{
171	202	int known_bridge = 0;
...	...	@@ -199,6 +230,8 @@
199	230	if (pci_mmcfg_arch_init()) {
200	231	if (type == 1)
201	232	unreachable_devices();
	233	+ if (known_bridge)
	234	+ pci_mmcfg_insert_resources();
202	235	pci_probe = (pci_probe & ~PCI_PROBE_MASK) \| PCI_PROBE_MMCONF;
203	236	}
204	237	}