powerpc/pci: Don't add bogus empty resources to PHBs
PATCH 1/1 powerpc/pci: Don't add bogus empty resources to PHBs
When converting to use the new pci_add_resource_offset() we didn't properly account for empty resources (0 flags) and add those bogons to the PHBs. The result is some annoying messages in the log.
Signed-off-by Benjamin Herrenschmidt <[email protected]>
---
BTW. Anybody knows if we really need those ppc32 workarounds anymore ?
They smell like ancient pre-device-tree crap... if a bridge is missing a window in its "ranges" property it should probably not have it exposed to the generic code nowadays.
arch/powerpc/kernel/pci-common.c +16 -14
@@ -1532,12 +1532,16 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, res->flags =IORESOURCE_IO ;#endif /* CONFIG_PPC32 */ } +if (res->flags) { +pr_debug ("PCI: PHB IO resource = %016llx-%016llx [%lx]\n" , + (unsigned long long )res->start, + (unsigned long long )res->end, + (unsigned long )res->flags); +pci_add_resource_offset (resources, res,pcibios_io_space_offset (hose)); -pr_debug ("PCI: PHB IO resource = %016llx-%016llx [%lx]\n" , - (unsigned long long )res->start, - (unsigned long long )res->end, - (unsigned long )res->flags); -pci_add_resource_offset (resources, res,pcibios_io_space_offset (hose)); +pr_debug ("PCI: PHB IO offset = %08lx\n" , + (unsigned long )hose->io_base_virt - _IO_BASE); + }/* Hookup PHB Memory resources */ for (i =0 ; i <3 ; ++i) {
@@ -1555,19 +1559,17 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose, res->flags =IORESOURCE_MEM ;#endif /* CONFIG_PPC32 */ } - -pr_debug ("PCI: PHB MEM resource %d = %016llx-%016llx [%lx]\n" , i, - (unsigned long long )res->start, - (unsigned long long )res->end, - (unsigned long )res->flags); -pci_add_resource_offset (resources, res, hose->pci_mem_offset); +if (res->flags) { +pr_debug ("PCI: PHB MEM resource %d = %016llx-%016llx [%lx]\n" , i, + (unsigned long long )res->start, + (unsigned long long )res->end, + (unsigned long )res->flags); +pci_add_resource_offset (resources, res, hose->pci_mem_offset); + } }pr_debug ("PCI: PHB MEM offset = %016llx\n" , (unsigned long long )hose->pci_mem_offset); -pr_debug ("PCI: PHB IO offset = %08lx\n" , - (unsigned long )hose->io_base_virt - _IO_BASE); - }/*