From patchwork Wed Aug 15 08:57:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V7,1/3] powerpc/pci: Make sure ISA IO base is not zero Date: Tue, 14 Aug 2012 22:57:04 -0000 From: Hongtao Jia X-Patchwork-Id: 177594 Message-Id: <1345021026-10886-2-git-send-email-B38951@freescale.com> To: , , Cc: B07421@freescale.com, b38951@freescale.com From: Benjamin Herrenschmidt Some platforms like QEMU treat 0 as an invalid address for ISA IO base. So we make sure that ISA IO base will never be zero. By functionality this is equivalent to assgin the first pci bus detected as a primary bus. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Jia Hongtao --- arch/powerpc/kernel/pci-common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 0f75bd5..2a09aa5 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -734,7 +734,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, hose->io_base_virt = ioremap(cpu_addr, size); /* Expect trouble if pci_addr is not 0 */ - if (primary) + if (primary || !isa_io_base) isa_io_base = (unsigned long)hose->io_base_virt; #endif /* CONFIG_PPC32 */