aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2011-07-25 13:08:40 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-08-01 11:50:31 -0700
commit2aceefcbd5a73059e5f52831817ec277e987440d (patch)
tree37b1a0f36a0cde11ab73d5ca2108ab94a1eb10f6 /drivers
parent2bbc6942273b5b3097bd265d82227bdd84b351b2 (diff)
downloadautogen-2aceefcbd5a73059e5f52831817ec277e987440d.tar.gz
autogen-2aceefcbd5a73059e5f52831817ec277e987440d.tar.xz
autogen-2aceefcbd5a73059e5f52831817ec277e987440d.zip
PCI: make SRIOV resources optional
From: Yinghai Lu <yinghai@kernel.org> Allocate resources to SRIOV BARs only after all other required resource-requests are satisfied. Dont retry if resource allocation for SRIOV BARs fail. Signed-off-by: Ram Pai <linuxram@us.ibm.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/setup-bus.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 1796c6ffe91..1c19b9f4019 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -673,6 +673,16 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (r->parent || (r->flags & mask) != type)
continue;
r_size = resource_size(r);
+#ifdef CONFIG_PCI_IOV
+ /* put SRIOV requested res to the optional list */
+ if (add_head && i >= PCI_IOV_RESOURCES &&
+ i <= PCI_IOV_RESOURCE_END) {
+ r->end = r->start - 1;
+ add_to_list(add_head, dev, r, r_size, 1);
+ children_add_size += r_size;
+ continue;
+ }
+#endif
/* For bridges size != alignment */
align = pci_resource_alignment(dev, r);
order = __ffs(align) - 20;