[PATCH] powerpc: Experimental support for new G5 Macs (#2)

This adds some very basic support for the new machines, including the
Quad G5 (tested), and other new dual core based machines and iMac G5
iSight (untested). This is still experimental !  There is no thermal
control yet, there is no proper handing of MSIs, etc.. but it
boots, I have all 4 cores up on my machine. Compared to the previous
version of this patch, this one adds DART IOMMU support for the U4
chipset and thus should work fine on setups with more than 2Gb of RAM.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 18c5620f87fa..1daa5a06e9ea 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -345,7 +345,7 @@ void __init pmac_setup_arch(void)
 
 #ifdef CONFIG_SMP
         /* Check for Core99 */
-        if (find_devices("uni-n") || find_devices("u3"))
+        if (find_devices("uni-n") || find_devices("u3") || find_devices("u4"))
                 smp_ops = &core99_smp_ops;
 #ifdef CONFIG_PPC32
         else
@@ -635,7 +635,7 @@ static void __init pmac_init_early(void)
         /* Setup interrupt mapping options */
         ppc64_interrupt_controller = IC_OPEN_PIC;
 
-        iommu_init_early_u3();
+        iommu_init_early_dart();
 #endif
 }
 
@@ -711,7 +711,7 @@ static int __init pmac_probe(int platform)
          * occupies having to be broken up so the DART itself is not
          * part of the cacheable linar mapping
          */
-        alloc_u3_dart_table();
+        alloc_dart_table();
 #endif
 
 #ifdef CONFIG_PMAC_SMU
@@ -733,10 +733,11 @@ static int pmac_pci_probe_mode(struct pci_bus *bus)
         struct device_node *node = bus->sysdata;
 
         /* We need to use normal PCI probing for the AGP bus,
-           since the device for the AGP bridge isn't in the tree. */
-        if (bus->self == NULL && device_is_compatible(node, "u3-agp"))
+         * since the device for the AGP bridge isn't in the tree.
+         */
+        if (bus->self == NULL && (device_is_compatible(node, "u3-agp") ||
+                                  device_is_compatible(node, "u4-pcie")))
                 return PCI_PROBE_NORMAL;
-
         return PCI_PROBE_DEVTREE;
 }
 #endif