bcm53xx: use two upstream USB bcma patches
[openwrt/openwrt.git] / target / linux / bcm53xx / patches-4.4 / 180-PCI-iproc-Fix-BCMA-PCIe-bus-scanning-regression.patch
1 From patchwork Wed Jan 20 22:55:10 2016
2 Content-Type: text/plain; charset="utf-8"
3 MIME-Version: 1.0
4 Content-Transfer-Encoding: 7bit
5 Subject: PCI: iproc: Fix BCMA PCIe bus scanning regression
6 From: Ray Jui <rjui@broadcom.com>
7 X-Patchwork-Id: 570953
8 Message-Id: <1453330510-21926-1-git-send-email-rjui@broadcom.com>
9 To: Bjorn Helgaas <bhelgaas@google.com>
10 Cc: Rafal Milecki <zajec5@gmail.com>, Hante Meuleman <meuleman@broadcom.com>,
11 Hauke Mehrtens <hauke@hauke-m.de>, <linux-kernel@vger.kernel.org>,
12 <bcm-kernel-feedback-list@broadcom.com>,
13 <linux-pci@vger.kernel.org>, Ray Jui <rjui@broadcom.com>
14 Date: Wed, 20 Jan 2016 14:55:10 -0800
15
16 Commit 943ebae781f5 ("PCI: iproc: Add PAXC interface support") causes
17 regression on EP device detection on BCMA based platforms. This patch
18 fixes the issue by allowing multiple devices to be configured on the
19 same bus, for all PAXB based child buses
20
21 Reported-by: Rafal Milecki <zajec5@gmail.com>
22 Fixes: 943ebae781f5 ("PCI: iproc: Add PAXC interface support")
23 Signed-off-by: Ray Jui <rjui@broadcom.com>
24 ---
25 drivers/pci/host/pcie-iproc.c | 5 +++--
26 1 file changed, 3 insertions(+), 2 deletions(-)
27
28 --- a/drivers/pci/host/pcie-iproc.c
29 +++ b/drivers/pci/host/pcie-iproc.c
30 @@ -171,10 +171,11 @@ static inline void iproc_pcie_ob_write(s
31 }
32
33 static inline bool iproc_pcie_device_is_valid(struct iproc_pcie *pcie,
34 + unsigned int busnum,
35 unsigned int slot,
36 unsigned int fn)
37 {
38 - if (slot > 0)
39 + if ((pcie->type == IPROC_PCIE_PAXC || busnum == 0) && slot > 0)
40 return false;
41
42 /* PAXC can only support limited number of functions */
43 @@ -199,7 +200,7 @@ static void __iomem *iproc_pcie_map_cfg_
44 u32 val;
45 u16 offset;
46
47 - if (!iproc_pcie_device_is_valid(pcie, slot, fn))
48 + if (!iproc_pcie_device_is_valid(pcie, busno, slot, fn))
49 return NULL;
50
51 /* root complex access */