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

Commit 11183991 authored Oct 29, 2015 by David Daney Committed by Bjorn Helgaas Oct 29, 2015

PCI: Handle Enhanced Allocation capability for SR-IOV devices



SR-IOV BARs can be specified via EA entries.  Extend the EA parser to
extract the SRIOV BAR resources, and modify sriov_init() to use resources
previously obtained via EA.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Sean O. Stalley <sean.stalley@intel.com>

parent 938174e5

drivers/pci/iov.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -436,6 +436,13 @@ static int sriov_init(struct pci_dev *dev, int pos)
		nres = 0;
		for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
		res = &dev->resource[i + PCI_IOV_RESOURCES];
		/*
		* If it is already FIXED, don't change it, something
		* (perhaps EA or header fixups) wants it this way.
		*/
		if (res->flags & IORESOURCE_PCI_FIXED)
		bar64 = (res->flags & IORESOURCE_MEM_64) ? 1 : 0;
		else
		bar64 = __pci_read_base(dev, pci_bar_unknown, res,
		pos + PCI_SRIOV_BAR + i * 4);
		if (!res->flags)

drivers/pci/pci.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -2176,6 +2176,12 @@ static struct resource pci_ea_get_resource(struct pci_dev dev, u8 bei,
		{
		if (bei <= PCI_EA_BEI_BAR5 && prop <= PCI_EA_P_IO)
		return &dev->resource[bei];
		#ifdef CONFIG_PCI_IOV
		else if (bei >= PCI_EA_BEI_VF_BAR0 && bei <= PCI_EA_BEI_VF_BAR5 &&
		(prop == PCI_EA_P_VF_MEM \|\| prop == PCI_EA_P_VF_MEM_PREFETCH))
		return &dev->resource[PCI_IOV_RESOURCES +
		bei - PCI_EA_BEI_VF_BAR0];
		#endif
		else if (bei == PCI_EA_BEI_ROM)
		return &dev->resource[PCI_ROM_RESOURCE];
		else