From: Yinghai Lu Date: Sat, 18 Jun 2016 02:24:53 +0000 (-0700) Subject: sparc/PCI: Keep resource idx order with bridge register number X-Git-Tag: v4.1.12-102.0.20170529_2200~72 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9b4d821bf313d2602e4aadc6a595f30b8fd4dd74;p=users%2Fjedix%2Flinux-maple.git sparc/PCI: Keep resource idx order with bridge register number On one system found strange "no compatible bridge window" warning even we already had pref_compat support that add extra pref bit for device resource. PCI: Claiming 0000:00:01.0: Resource 14: 0002000100000000..000200010fffffff [10220c] PCI: Claiming 0000:01:00.0: Resource 1: 0002000100000000..000200010000ffff [100214] pci 0000:01:00.0: can't claim BAR 1 [mem 0x2000100000000-0x200010000ffff 64bit]: no compatible bridge window It turns out that pci_resource_compatible()/pci_up_path_over_pref_mem64() just check resource with bridge pref mmio register idx 15, and we have put resource to use mmio register idx 14 during of_scan_pci_bridge() as the bridge does not have mmio resource. We already fix pci_up_path_over_pref_mem64() to check all bus resources. And at the same time, this patch make resource to have consistent sequence like other arch or directly from pci_read_bridge_bases(), even when non-pref mmio is missing, or out of ordering in firmware reporting. Just hold i = 1 for non pref mmio, and i = 2 for pref mmio. Signed-off-by: Yinghai Lu Tested-by: Khalid Aziz Cc: sparclinux@vger.kernel.org Orabug: 22855133 Signed-off-by: Khalid Aziz (cherry picked from commit 71c1871c22891102da6303d09b46184361d5f853) Signed-off-by: Allen Pais --- diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 0155fb7182f25..c98dcad965a1b 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -477,7 +477,7 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, pci_read_bridge_bases(bus); goto after_ranges; } - i = 1; + i = 3; for (; len >= 32; len -= 32, ranges += 8) { u64 start; @@ -509,6 +509,12 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, " for bridge %s\n", node->full_name); continue; } + } else if ((flags & IORESOURCE_PREFETCH) && + !bus->resource[2]->flags) { + res = bus->resource[2]; + } else if (((flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH)) == + IORESOURCE_MEM) && !bus->resource[1]->flags) { + res = bus->resource[1]; } else { if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) { printk(KERN_ERR "PCI: too many memory ranges"