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

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

PCI: Handle IORESOURCE_PCI_FIXED when sizing resources 



The new Enhanced Allocation (EA) capability support (patches to follow)
creates resources with the IORESOURCE_PCI_FIXED set.  Since these resources
cannot be relocated or resized, their alignment is not really defined, and
it is therefore not specified.  This causes a problem in pbus_size_mem()
where resources with unspecified alignment are disabled.

So, in pbus_size_mem() skip IORESOURCE_PCI_FIXED resources, instead of
disabling them.

[bhelgaas: folded in "flags & IORESOURCE_PCI_FIXED" fix from David]
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 0b26cd69

drivers/pci/setup-bus.c

+4 −3
Original line number Diff line number Diff line
@@ -1037,7 +1037,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, 
			struct resource *r = &dev->resource[i];

			resource_size_t r_size;



			if (r->parent || ((r->flags & mask) != type &&

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

			    ((r->flags & mask) != type &&

			     (r->flags & mask) != type2 &&

			     (r->flags & mask) != type3))

				continue;