[PATCH] ppc64: fix PCI IO mapping (0f34f490) · Commits · 戴 / test

phbs_remap_io(), which maps the PCI IO space into the kernel virtual space, is called too early on powermac, and thus doesn't work. This fixes it by removing the call from all platforms and putting it back into the ppc64 common code where it belongs, after the actual probing of the bus. That means that before that call, only the ISA IO space (if any) is mapped, any PIO access (from quirks for example) will fail. This happens not to be a problem for now, but we'll have to rework that code if it becomes one in the future. Signed-off-by:

Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by:

Paul Mackerras <paulus@samba.org>

arch/powerpc/platforms/maple/pci.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -380,9 +380,6 @@ void __init maple_pcibios_fixup(void)
		for_each_pci_dev(dev)
		pci_read_irq_line(dev);

		/* Do the mapping of the IO space */
		phbs_remap_io();

		DBG(" <- maple_pcibios_fixup\n");
		}

arch/powerpc/platforms/powermac/pci.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -918,9 +918,6 @@ void __init pmac_pci_init(void)
		PCI_DN(np)->busno = 0xf0;
		}

		/* map in PCI I/O space */
		phbs_remap_io();

		/* pmac_check_ht_link(); */

		/* Tell pci.c to not use the common resource allocation mechanism */

arch/powerpc/platforms/pseries/pci.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ static void __init pSeries_request_regions(void)

		void __init pSeries_final_fixup(void)
		{
		phbs_remap_io();
		pSeries_request_regions();

		pci_addr_cache_build();

arch/ppc64/kernel/pci.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -548,6 +548,9 @@ static int __init pcibios_init(void)
		if (ppc64_isabridge_dev != NULL)
		printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));

		/* map in PCI I/O space */
		phbs_remap_io();

		printk("PCI: Probing PCI hardware done\n");

		return 0;

Admin message