powerpc: Merge in 64-bit powermac support.

This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to
arch/powerpc/platforms/powermac/*.c and makes various minor tweaks
elsewhere.  On the powermac we now initialize ppc_md by copying
the whole pmac_md structure into it, which required some changes in
the ordering of initializations of individual fields of it.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 314 insertions, 144 deletions

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 0bad53fa36ef..da0cb165dfc6 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -1,11 +1,11 @@
 /*
- *  arch/ppc/platforms/setup.c
+ *  Powermac setup and early boot code plus other random bits.
  *
  *  PowerPC version
  *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
  *
  *  Adapted for Power Macintosh by Paul Mackerras
- *    Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)
+ *    Copyright (C) 1996 Paul Mackerras (paulus@samba.org)
  *
  *  Derived from "arch/alpha/kernel/setup.c"
  *    Copyright (C) 1995 Linus Torvalds
@@ -65,13 +65,16 @@
 #include <asm/mediabay.h>
 #include <asm/machdep.h>
 #include <asm/dma.h>
-#include <asm/bootx.h>
 #include <asm/cputable.h>
 #include <asm/btext.h>
 #include <asm/pmac_feature.h>
 #include <asm/time.h>
 #include <asm/of_device.h>
 #include <asm/mmu_context.h>
+#include <asm/iommu.h>
+#include <asm/smu.h>
+#include <asm/pmc.h>
+#include <asm/mpic.h>
 
 #include "pmac.h"
 
@@ -88,16 +91,24 @@ int pmac_newworld = 1;
 static int current_root_goodness = -1;
 
 extern int pmac_newworld;
+extern struct machdep_calls pmac_md;
 
 #define DEFAULT_ROOT_DEVICE Root_SDA1   /* sda1 - slightly silly choice */
 
-extern void zs_kgdb_hook(int tty_num);
-static void ohare_init(void);
-#ifdef CONFIG_BOOTX_TEXT
-static void pmac_progress(char *s, unsigned short hex);
+#ifdef CONFIG_PPC64
+#include <asm/udbg.h>
+int sccdbg;
 #endif
 
+extern void zs_kgdb_hook(int tty_num);
+
 sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN;
+EXPORT_SYMBOL(sys_ctrler);
+
+#ifdef CONFIG_PMAC_SMU
+unsigned long smu_cmdbuf_abs;
+EXPORT_SYMBOL(smu_cmdbuf_abs);
+#endif
 
 #ifdef CONFIG_SMP
 extern struct smp_ops_t psurge_smp_ops;
@@ -191,44 +202,69 @@ static void pmac_show_percpuinfo(struct seq_file *m, int i)
                 return;
         }
 #endif /* CONFIG_CPU_FREQ_PMAC */
+#ifdef CONFIG_PPC32
         of_show_percpuinfo(m, i);
+#endif
 }
 
-static volatile u32 *sysctrl_regs;
+#ifndef CONFIG_ADB_CUDA
+int find_via_cuda(void)
+{
+        if (!find_devices("via-cuda"))
+                return 0;
+        printk("WARNING ! Your machine is CUDA-based but your kernel\n");
+        printk("          wasn't compiled with CONFIG_ADB_CUDA option !\n");
+        return 0;
+}
+#endif
 
-void __init
-pmac_setup_arch(void)
+#ifndef CONFIG_ADB_PMU
+int find_via_pmu(void)
 {
-        struct device_node *cpu;
-        int *fp;
-        unsigned long pvr;
+        if (!find_devices("via-pmu"))
+                return 0;
+        printk("WARNING ! Your machine is PMU-based but your kernel\n");
+        printk("          wasn't compiled with CONFIG_ADB_PMU option !\n");
+        return;
+}
+#endif
 
-        pvr = PVR_VER(mfspr(SPRN_PVR));
+#ifndef CONFIG_PMAC_SMU
+int smu_init(void)
+{
+        /* should check and warn if SMU is present */
+        return 0;
+}
+#endif
 
-        /* Set loops_per_jiffy to a half-way reasonable value,
-           for use until calibrate_delay gets called. */
-        cpu = find_type_devices("cpu");
-        if (cpu != 0) {
-                fp = (int *) get_property(cpu, "clock-frequency", NULL);
-                if (fp != 0) {
-                        if (pvr == 4 || pvr >= 8)
-                                /* 604, G3, G4 etc. */
-                                loops_per_jiffy = *fp / HZ;
-                        else
-                                /* 601, 603, etc. */
-                                loops_per_jiffy = *fp / (2*HZ);
-                } else
-                        loops_per_jiffy = 50000000 / HZ;
-        }
+#ifdef CONFIG_PPC32
+static volatile u32 *sysctrl_regs;
 
+static void __init ohare_init(void)
+{
         /* this area has the CPU identification register
            and some registers used by smp boards */
         sysctrl_regs = (volatile u32 *) ioremap(0xf8000000, 0x1000);
-        ohare_init();
 
-        /* Lookup PCI hosts */
-        pmac_find_bridges();
+        /*
+         * Turn on the L2 cache.
+         * We assume that we have a PSX memory controller iff
+         * we have an ohare I/O controller.
+         */
+        if (find_devices("ohare") != NULL) {
+                if (((sysctrl_regs[2] >> 24) & 0xf) >= 3) {
+                        if (sysctrl_regs[4] & 0x10)
+                                sysctrl_regs[4] |= 0x04000020;
+                        else
+                                sysctrl_regs[4] |= 0x04000000;
+                        if(has_l2cache)
+                                printk(KERN_INFO "Level 2 cache enabled\n");
+                }
+        }
+}
 
+static void __init l2cr_init(void)
+{
         /* Checks "l2cr-value" property in the registry */
         if (cpu_has_feature(CPU_FTR_L2CR)) {
                 struct device_node *np = find_devices("cpus");
@@ -247,68 +283,90 @@ pmac_setup_arch(void)
         }
 
         if (ppc_override_l2cr)
-                printk(KERN_INFO "L2CR overriden (0x%x), backside cache is %s\n",
-                        ppc_override_l2cr_value, (ppc_override_l2cr_value & 0x80000000)
+                printk(KERN_INFO "L2CR overridden (0x%x), "
+                       "backside cache is %s\n",
+                       ppc_override_l2cr_value,
+                       (ppc_override_l2cr_value & 0x80000000)
                                 ? "enabled" : "disabled");
+}
+#endif
+
+void __init pmac_setup_arch(void)
+{
+        struct device_node *cpu;
+        int *fp;
+        unsigned long pvr;
+
+        pvr = PVR_VER(mfspr(SPRN_PVR));
+
+        /* Set loops_per_jiffy to a half-way reasonable value,
+           for use until calibrate_delay gets called. */
+        loops_per_jiffy = 50000000 / HZ;
+        cpu = of_find_node_by_type(NULL, "cpu");
+        if (cpu != NULL) {
+                fp = (int *) get_property(cpu, "clock-frequency", NULL);
+                if (fp != NULL) {
+                        if (pvr >= 0x30 && pvr < 0x80)
+                                /* PPC970 etc. */
+                                loops_per_jiffy = *fp / (3 * HZ);
+                        else if (pvr == 4 || pvr >= 8)
+                                /* 604, G3, G4 etc. */
+                                loops_per_jiffy = *fp / HZ;
+                        else
+                                /* 601, 603, etc. */
+                                loops_per_jiffy = *fp / (2 * HZ);
+                }
+                of_node_put(cpu);
+        }
+
+        /* Lookup PCI hosts */
+        pmac_pci_init();
+
+#ifdef CONFIG_PPC32
+        ohare_init();
+        l2cr_init();
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+        /* Probe motherboard chipset */
+        /* this is done earlier in setup_arch for 32-bit */
+        pmac_feature_init();
+
+        /* We can NAP */
+        powersave_nap = 1;
+        printk(KERN_INFO "Using native/NAP idle loop\n");
+#endif
 
 #ifdef CONFIG_KGDB
         zs_kgdb_hook(0);
 #endif
 
-#ifdef CONFIG_ADB_CUDA
         find_via_cuda();
-#else
-        if (find_devices("via-cuda")) {
-                printk("WARNING ! Your machine is Cuda based but your kernel\n");
-                printk("          wasn't compiled with CONFIG_ADB_CUDA option !\n");
-        }
-#endif
-#ifdef CONFIG_ADB_PMU
         find_via_pmu();
-#else
-        if (find_devices("via-pmu")) {
-                printk("WARNING ! Your machine is PMU based but your kernel\n");
-                printk("          wasn't compiled with CONFIG_ADB_PMU option !\n");
-        }
-#endif
+        smu_init();
+
 #ifdef CONFIG_NVRAM
         pmac_nvram_init();
 #endif
+
+#ifdef CONFIG_PPC32
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
                 ROOT_DEV = Root_RAM0;
         else
 #endif
                 ROOT_DEV = DEFAULT_ROOT_DEVICE;
+#endif
 
 #ifdef CONFIG_SMP
         /* Check for Core99 */
         if (find_devices("uni-n") || find_devices("u3"))
                 smp_ops = &core99_smp_ops;
+#ifdef CONFIG_PPC32
         else
                 smp_ops = &psurge_smp_ops;
+#endif
 #endif /* CONFIG_SMP */
-
-        pci_create_OF_bus_map();
-}
-
-static void __init ohare_init(void)
-{
-        /*
-         * Turn on the L2 cache.
-         * We assume that we have a PSX memory controller iff
-         * we have an ohare I/O controller.
-         */
-        if (find_devices("ohare") != NULL) {
-                if (((sysctrl_regs[2] >> 24) & 0xf) >= 3) {
-                        if (sysctrl_regs[4] & 0x10)
-                                sysctrl_regs[4] |= 0x04000020;
-                        else
-                                sysctrl_regs[4] |= 0x04000000;
-                        if(has_l2cache)
-                                printk(KERN_INFO "Level 2 cache enabled\n");
-                }
-        }
 }
 
 char *bootpath;
@@ -319,8 +377,7 @@ int boot_part;
 extern dev_t boot_dev;
 
 #ifdef CONFIG_SCSI
-void __init
-note_scsi_host(struct device_node *node, void *host)
+void __init note_scsi_host(struct device_node *node, void *host)
 {
         int l;
         char *p;
@@ -351,8 +408,7 @@ EXPORT_SYMBOL(note_scsi_host);
 #endif
 
 #if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
-static dev_t __init
-find_ide_boot(void)
+static dev_t __init find_ide_boot(void)
 {
         char *p;
         int n;
@@ -369,15 +425,13 @@ find_ide_boot(void)
 }
 #endif /* CONFIG_BLK_DEV_IDE && CONFIG_BLK_DEV_IDE_PMAC */
 
-static void __init
-find_boot_device(void)
+static void __init find_boot_device(void)
 {
 #if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
         boot_dev = find_ide_boot();
 #endif
 }
 
-static int initializing = 1;
 /* TODO: Merge the suspend-to-ram with the common code !!!
  * currently, this is a stub implementation for suspend-to-disk
  * only
@@ -428,6 +482,8 @@ static struct pm_ops pmac_pm_ops = {
 
 #endif /* CONFIG_SOFTWARE_SUSPEND */
 
+static int initializing = 1;
+
 static int pmac_late_init(void)
 {
         initializing = 0;
@@ -440,8 +496,7 @@ static int pmac_late_init(void)
 late_initcall(pmac_late_init);
 
 /* can't be __init - can be called whenever a disk is first accessed */
-void
-note_bootable_part(dev_t dev, int part, int goodness)
+void note_bootable_part(dev_t dev, int part, int goodness)
 {
         static int found_boot = 0;
         char *p;
@@ -466,52 +521,68 @@ note_bootable_part(dev_t dev, int part, int goodness)
         }
 }
 
-static void
-pmac_restart(char *cmd)
-{
 #ifdef CONFIG_ADB_CUDA
+static void cuda_restart(void)
+{
         struct adb_request req;
-#endif /* CONFIG_ADB_CUDA */
 
+        cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM);
+        for (;;)
+                cuda_poll();
+}
+
+static void cuda_shutdown(void)
+{
+        struct adb_request req;
+
+        cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN);
+        for (;;)
+                cuda_poll();
+}
+
+#else
+#define cuda_restart()
+#define cuda_shutdown()
+#endif
+
+#ifndef CONFIG_ADB_PMU
+#define pmu_restart()
+#define pmu_shutdown()
+#endif
+
+#ifndef CONFIG_PMAC_SMU
+#define smu_restart()
+#define smu_shutdown()
+#endif
+
+static void pmac_restart(char *cmd)
+{
         switch (sys_ctrler) {
-#ifdef CONFIG_ADB_CUDA
         case SYS_CTRLER_CUDA:
-                cuda_request(&req, NULL, 2, CUDA_PACKET,
-                             CUDA_RESET_SYSTEM);
-                for (;;)
-                        cuda_poll();
+                cuda_restart();
                 break;
-#endif /* CONFIG_ADB_CUDA */
-#ifdef CONFIG_ADB_PMU
         case SYS_CTRLER_PMU:
                 pmu_restart();
                 break;
-#endif /* CONFIG_ADB_PMU */
+        case SYS_CTRLER_SMU:
+                smu_restart();
+                break;
         default: ;
         }
 }
 
-static void
-pmac_power_off(void)
+static void pmac_power_off(void)
 {
-#ifdef CONFIG_ADB_CUDA
-        struct adb_request req;
-#endif /* CONFIG_ADB_CUDA */
-
         switch (sys_ctrler) {
-#ifdef CONFIG_ADB_CUDA
         case SYS_CTRLER_CUDA:
-                cuda_request(&req, NULL, 2, CUDA_PACKET,
-                             CUDA_POWERDOWN);
-                for (;;)
-                        cuda_poll();
+                cuda_shutdown();
                 break;
-#endif /* CONFIG_ADB_CUDA */
-#ifdef CONFIG_ADB_PMU
         case SYS_CTRLER_PMU:
                 pmu_shutdown();
                 break;
-#endif /* CONFIG_ADB_PMU */
+        case SYS_CTRLER_SMU:
+                smu_shutdown();
+                break;
         default: ;
         }
 }
@@ -522,37 +593,17 @@ pmac_halt(void)
         pmac_power_off();
 }
 
+#ifdef CONFIG_PPC32
 void __init pmac_init(void)
 {
-        /* isa_io_base gets set in pmac_find_bridges */
+        /* isa_io_base gets set in pmac_pci_init */
         isa_mem_base = PMAC_ISA_MEM_BASE;
         pci_dram_offset = PMAC_PCI_DRAM_OFFSET;
         ISA_DMA_THRESHOLD = ~0L;
         DMA_MODE_READ = 1;
         DMA_MODE_WRITE = 2;
 
-        ppc_md.setup_arch     = pmac_setup_arch;
-        ppc_md.show_cpuinfo   = pmac_show_cpuinfo;
-        ppc_md.show_percpuinfo = pmac_show_percpuinfo;
-        ppc_md.init_IRQ       = pmac_pic_init;
-        ppc_md.get_irq        = pmac_get_irq; /* Changed later on ... */
-
-        ppc_md.pcibios_fixup  = pmac_pcibios_fixup;
-        ppc_md.pcibios_enable_device_hook = pmac_pci_enable_device_hook;
-        ppc_md.pcibios_after_init = pmac_pcibios_after_init;
-        ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
-
-        ppc_md.restart        = pmac_restart;
-        ppc_md.power_off      = pmac_power_off;
-        ppc_md.halt           = pmac_halt;
-
-        ppc_md.time_init      = pmac_time_init;
-        ppc_md.set_rtc_time   = pmac_set_rtc_time;
-        ppc_md.get_rtc_time   = pmac_get_rtc_time;
-        ppc_md.get_boot_time  = pmac_get_boot_time;
-        ppc_md.calibrate_decr = pmac_calibrate_decr;
-
-        ppc_md.feature_call   = pmac_do_feature_call;
+        ppc_md = pmac_md;
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 #ifdef CONFIG_BLK_DEV_IDE_PMAC
@@ -561,27 +612,62 @@ void __init pmac_init(void)
 #endif /* CONFIG_BLK_DEV_IDE_PMAC */
 #endif /* defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) */
 
-#ifdef CONFIG_BOOTX_TEXT
-        ppc_md.progress = pmac_progress;
-#endif /* CONFIG_BOOTX_TEXT */
-
         if (ppc_md.progress) ppc_md.progress("pmac_init(): exit", 0);
 
 }
+#endif
 
-#ifdef CONFIG_BOOTX_TEXT
-static void __init
-pmac_progress(char *s, unsigned short hex)
+/* 
+ * Early initialization.
+ */
+static void __init pmac_init_early(void)
+{
+#ifdef CONFIG_PPC64
+        /* Initialize hash table, from now on, we can take hash faults
+         * and call ioremap
+         */
+        hpte_init_native();
+
+        /* Init SCC */
+        if (strstr(cmd_line, "sccdbg")) {
+                sccdbg = 1;
+                udbg_init_scc(NULL);
+        }
+
+        /* Setup interrupt mapping options */
+        ppc64_interrupt_controller = IC_OPEN_PIC;
+
+        iommu_init_early_u3();
+#endif
+}
+
+static void __init pmac_progress(char *s, unsigned short hex)
 {
+#ifdef CONFIG_PPC64
+        if (sccdbg) {
+                udbg_puts(s);
+                udbg_puts("\n");
+                return;
+        }
+#endif
+#ifdef CONFIG_BOOTX_TEXT
         if (boot_text_mapped) {
                 btext_drawstring(s);
                 btext_drawchar('\n');
         }
-}
 #endif /* CONFIG_BOOTX_TEXT */
+}
 
-static int __init
-pmac_declare_of_platform_devices(void)
+/*
+ * pmac has no legacy IO, anything calling this function has to
+ * fail or bad things will happen
+ */
+static int pmac_check_legacy_ioport(unsigned int baseport)
+{
+        return -ENODEV;
+}
+
+static int __init pmac_declare_of_platform_devices(void)
 {
         struct device_node *np;
 
@@ -594,6 +680,13 @@ pmac_declare_of_platform_devices(void)
                                 break;
                         }
         }
+        np = find_devices("valkyrie");
+        if (np)
+                of_platform_device_create(np, "valkyrie", NULL);
+        np = find_devices("platinum");
+        if (np)
+                of_platform_device_create(np, "platinum", NULL);
+
         np = find_devices("u3");
         if (np) {
                 for (np = np->child; np != NULL; np = np->sibling)
@@ -603,15 +696,92 @@ pmac_declare_of_platform_devices(void)
                                 break;
                         }
         }
-
-        np = find_devices("valkyrie");
-        if (np)
-                of_platform_device_create(np, "valkyrie", NULL);
-        np = find_devices("platinum");
-        if (np)
-                of_platform_device_create(np, "platinum", NULL);
+        np = of_find_node_by_type(NULL, "smu");
+        if (np) {
+                of_platform_device_create(np, "smu", NULL);
+                of_node_put(np);
+        }
 
         return 0;
 }
 
 device_initcall(pmac_declare_of_platform_devices);
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init pmac_probe(int platform)
+{
+#ifdef CONFIG_PPC64
+        if (platform != PLATFORM_POWERMAC)
+                return 0;
+
+        /*
+         * On U3, the DART (iommu) must be allocated now since it
+         * has an impact on htab_initialize (due to the large page it
+         * occupies having to be broken up so the DART itself is not
+         * part of the cacheable linar mapping
+         */
+        alloc_u3_dart_table();
+#endif
+
+#ifdef CONFIG_PMAC_SMU
+        /*
+         * SMU based G5s need some memory below 2Gb, at least the current
+         * driver needs that. We have to allocate it now. We allocate 4k
+         * (1 small page) for now.
+         */
+        smu_cmdbuf_abs = lmb_alloc_base(4096, 4096, 0x80000000UL);
+#endif /* CONFIG_PMAC_SMU */
+
+        return 1;
+}
+
+#ifdef CONFIG_PPC64
+static int pmac_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"))
+                return PCI_PROBE_NORMAL;
+
+        return PCI_PROBE_DEVTREE;
+}
+#endif
+
+struct machdep_calls __initdata pmac_md = {
+#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC64)
+        .cpu_die                = generic_mach_cpu_die,
+#endif
+        .probe                  = pmac_probe,
+        .setup_arch             = pmac_setup_arch,
+        .init_early             = pmac_init_early,
+        .show_cpuinfo           = pmac_show_cpuinfo,
+        .show_percpuinfo        = pmac_show_percpuinfo,
+        .init_IRQ               = pmac_pic_init,
+        .get_irq                = mpic_get_irq, /* changed later */
+        .pcibios_fixup          = pmac_pcibios_fixup,
+        .restart                = pmac_restart,
+        .power_off              = pmac_power_off,
+        .halt                   = pmac_halt,
+        .time_init              = pmac_time_init,
+        .get_boot_time          = pmac_get_boot_time,
+        .set_rtc_time           = pmac_set_rtc_time,
+        .get_rtc_time           = pmac_get_rtc_time,
+        .calibrate_decr         = pmac_calibrate_decr,
+        .feature_call           = pmac_do_feature_call,
+        .check_legacy_ioport    = pmac_check_legacy_ioport,
+        .progress               = pmac_progress,
+#ifdef CONFIG_PPC64
+        .pci_probe_mode         = pmac_probe_mode,
+        .idle_loop              = native_idle,
+        .enable_pmcs            = power4_enable_pmcs,
+#endif
+#ifdef CONFIG_PPC32
+        .pcibios_enable_device_hook = pmac_pci_enable_device_hook,
+        .pcibios_after_init     = pmac_pcibios_after_init,
+        .phys_mem_access_prot   = pci_phys_mem_access_prot,
+#endif
+};