From a0b8e76facbb1f12e4b43a2b7b88bd5d18a3faf5 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 4 May 2013 14:22:57 +0000 Subject: 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 --- arch/powerpc/kernel/pci-common.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'arch/powerpc') diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index d5811d8cc2c..cf00588b002 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1540,12 +1540,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) { @@ -1563,19 +1567,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); - } /* -- cgit v1.2.3