summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-10-20 11:45:50 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-10-20 11:45:50 -0500
commitdeab1f261cd34ed1c0d9b6558c6ce90fd49a431e (patch)
tree18ba9e2fc6fdc129baafd53d1d869487fc6a99b7 /drivers/pci
parent525fde0750394dd3874937361570764f6a368e33 (diff)
parent4da6b4480766e5bc9c4d7bc14bf1d0939a1a5fa7 (diff)
downloadlinux-deab1f261cd34ed1c0d9b6558c6ce90fd49a431e.tar.gz
linux-deab1f261cd34ed1c0d9b6558c6ce90fd49a431e.tar.bz2
linux-deab1f261cd34ed1c0d9b6558c6ce90fd49a431e.zip
Merge branch 'remotes/lorenzo/pci/iproc'
- Remove iproc PAXC slot check to allow VF support (Jitendra Bhivare) * remotes/lorenzo/pci/iproc: PCI: iproc: Remove PAXC slot check to allow VF support
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pcie-iproc.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index 3160e9342a2f..c20fd6bd68fd 100644
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -630,14 +630,6 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct iproc_pcie *pcie,
return (pcie->base + offset);
}
- /*
- * PAXC is connected to an internally emulated EP within the SoC. It
- * allows only one device.
- */
- if (pcie->ep_is_internal)
- if (slot > 0)
- return NULL;
-
return iproc_pcie_map_ep_cfg_reg(pcie, busno, slot, fn, where);
}