Merge branch 'remotes/lorenzo/pci/iproc'

bjorn-helgaas · bjorn-helgaas · commit deab1f261cd3 · 2018-10-20T11:45:50.000-05:00
- 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
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -630,14 +630,6 @@ static void __iomem iproc_pcie_map_cfg_bus(struct iproc_pcie pcie,`
`630`	`630`	`return (pcie->base + offset);`
`631`	`631`	`}`
`632`	`632`
`633`		`- /*`
`634`		`- * PAXC is connected to an internally emulated EP within the SoC. It`
`635`		`- * allows only one device.`
`636`		`- */`
`637`		`- if (pcie->ep_is_internal)`
`638`		`- if (slot > 0)`
`639`		`- return NULL;`
`640`		`-`
`641`	`633`	`return iproc_pcie_map_ep_cfg_reg(pcie, busno, slot, fn, where);`
`642`	`634`	`}`
`643`	`635`