From patchwork Wed Jan 20 22:55:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: PCI: iproc: Fix BCMA PCIe bus scanning regression From: Ray Jui X-Patchwork-Id: 570953 Message-Id: <1453330510-21926-1-git-send-email-rjui@broadcom.com> To: Bjorn Helgaas Cc: Rafal Milecki , Hante Meuleman , Hauke Mehrtens , , , , Ray Jui Date: Wed, 20 Jan 2016 14:55:10 -0800 Commit 943ebae781f5 ("PCI: iproc: Add PAXC interface support") causes regression on EP device detection on BCMA based platforms. This patch fixes the issue by allowing multiple devices to be configured on the same bus, for all PAXB based child buses Reported-by: Rafal Milecki Fixes: 943ebae781f5 ("PCI: iproc: Add PAXC interface support") Signed-off-by: Ray Jui --- drivers/pci/host/pcie-iproc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -171,10 +171,11 @@ static inline void iproc_pcie_ob_write(s } static inline bool iproc_pcie_device_is_valid(struct iproc_pcie *pcie, + unsigned int busnum, unsigned int slot, unsigned int fn) { - if (slot > 0) + if ((pcie->type == IPROC_PCIE_PAXC || busnum == 0) && slot > 0) return false; /* PAXC can only support limited number of functions */ @@ -199,7 +200,7 @@ static void __iomem *iproc_pcie_map_cfg_ u32 val; u16 offset; - if (!iproc_pcie_device_is_valid(pcie, slot, fn)) + if (!iproc_pcie_device_is_valid(pcie, busno, slot, fn)) return NULL; /* root complex access */