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

Commit d04d0111 authored by David Daney's avatar David Daney Committed by Bjorn Helgaas
Browse files

PCI: Handle IORESOURCE_PCI_FIXED when assigning resources 



The new Enhanced Allocation (EA) capability support (patches to follow)
creates resources with the IORESOURCE_PCI_FIXED set.  During resource
assignment in pci_bus_assign_resources(), IORESOURCE_PCI_FIXED resources
are not given a parent.  This, in turn, causes pci_enable_resources() to
fail with a "not claimed" error.

So, in __pci_bus_assign_resources(), for IORESOURCE_PCI_FIXED resources,
try to request the resource from a parent bus.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarSean O. Stalley <sean.stalley@intel.com>
parent a2220d80

drivers/pci/setup-bus.c

+43 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,47 @@ void pci_bus_size_bridges(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pci_bus_size_bridges);



static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)

{

	int i;

	struct resource *parent_r;

	unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM |

			     IORESOURCE_PREFETCH;



	pci_bus_for_each_resource(b, parent_r, i) {

		if (!parent_r)

			continue;



		if ((r->flags & mask) == (parent_r->flags & mask) &&

		    resource_contains(parent_r, r))

			request_resource(parent_r, r);

	}

}



/*

 * Try to assign any resources marked as IORESOURCE_PCI_FIXED, as they

 * are skipped by pbus_assign_resources_sorted().

 */

static void pdev_assign_fixed_resources(struct pci_dev *dev)

{

	int i;



	for (i = 0; i <  PCI_NUM_RESOURCES; i++) {

		struct pci_bus *b;

		struct resource *r = &dev->resource[i];



		if (r->parent || !(r->flags & IORESOURCE_PCI_FIXED) ||

		    !(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))

			continue;



		b = dev->bus;

		while (b && !r->parent) {

			assign_fixed_resource_on_bus(b, r);

			b = b->parent;

		}

	}

}



void __pci_bus_assign_resources(const struct pci_bus *bus,

				struct list_head *realloc_head,

				struct list_head *fail_head)
@@ -1351,6 +1392,8 @@ void __pci_bus_assign_resources(const struct pci_bus *bus, 
	pbus_assign_resources_sorted(bus, realloc_head, fail_head);



	list_for_each_entry(dev, &bus->devices, bus_list) {

		pdev_assign_fixed_resources(dev);



		b = dev->subordinate;

		if (!b)

			continue;