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

Commit 2aceefcb authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

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: default avatarRam Pai <linuxram@us.ibm.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 2bbc6942

drivers/pci/setup-bus.c

+10 −0
Original line number Diff line number Diff line
@@ -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;