Skip to contentSkip to conversation

yet another fix for setup-bus.c/x86 merge

PATCH In review Ivan Kokshaysky 2 participants 2 messages Jul 6, 2005 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 yet another fix for setup-bus.c/x86 merge

There is a slight disagreement between setup-bus.c code and traditional x86 PCI setup wrt which recourses are invalid vs resources that are free for further allocations.
Precisely, in the setup-bus.c, if we failed to allocate some resource, we nullify "start" and "flags" fields, but *not* the "end" one. But x86 pcibios_enable_resources() does the following check:

if (!r->start && r->end) {
	printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
	return -EINVAL;

which means that the device owning the offending resource cannot be enabled.
In particular, this breaks cardbus behind the normal decode p2p bridge - the cardbus code from setup-bus.c requests rather large IO and MEM windows, and if it fails, the socket is completely unavailable. Which is wrong, as the yenta code is capable to allocate smaller windows.

drivers/pci/setup-bus.c +1 -0
@@ -74,6 +74,7 @@ pbus_assign_resources_sorted(struct pci_
 		idx = res - &list->dev->resource[0];
 		if (pci_assign_resource(list->dev, idx)) {
 			res->start = 0;
+			res->end = 0;
 			res->flags = 0;
 		}
 		tmp = list;
Acked-by Greg Kroah-Hartman on v1 1/1
#1 lore raw
Quoted 9 lines · Ivan Kokshaysky

There is a slight disagreement between setup-bus.c code and traditional x86 PCI setup wrt which recourses are invalid vs resources that are free for further allocations.
Precisely, in the setup-bus.c, if we failed to allocate some resource, we nullify "start" and "flags" fields, but *not* the "end" one. But x86 pcibios_enable_resources() does the following check:

if (!r->start && r->end) {
	printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
	return -EINVAL;
Quoted 8 lines

which means that the device owning the offending resource cannot be enabled.
In particular, this breaks cardbus behind the normal decode p2p bridge - the cardbus code from setup-bus.c requests rather large IO and MEM windows, and if it fails, the socket is completely unavailable. Which is wrong, as the yenta code is capable to allocate smaller windows.

Thanks Ivan for finding this so quickly.

greg k-h