8 files changed, 101 insertions, 111 deletions

diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 567d5523b690..00f50298c342 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -357,13 +357,13 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu)
 
 static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-        if (policy->cpu != 0)
-                return -ENODEV;
-
         policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
         policy->cur = g5_cpu_freqs[g5_query_freq()].frequency;
-        policy->cpus = cpu_possible_map;
+        /* secondary CPUs are tied to the primary one by the
+         * cpufreq core if in the secondary policy we tell it that
+         * it actually must be one policy together with all others. */
+        policy->cpus = cpu_online_map;
         cpufreq_frequency_table_get_attr(g5_cpu_freqs, policy->cpu);
 
         return cpufreq_frequency_table_cpuinfo(policy,
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 52cfdd86c928..f29705f8047d 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -1418,7 +1418,7 @@ static long g5_eth_phy_reset(struct device_node *node, long param, long value)
         phy = of_get_next_child(node, NULL);
         if (!phy)
                 return -ENODEV;
-        need_reset = device_is_compatible(phy, "B5221");
+        need_reset = of_device_is_compatible(phy, "B5221");
         of_node_put(phy);
         if (!need_reset)
                 return 0;
@@ -2624,7 +2624,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
         for (node = NULL; (node = of_find_node_by_name(node, name)) != NULL;) {
                 if (!compat)
                         break;
-                if (device_is_compatible(node, compat))
+                if (of_device_is_compatible(node, compat))
                         break;
         }
         if (!node)
@@ -2728,7 +2728,7 @@ initial_serial_shutdown(struct device_node *np)
         conn = of_get_property(np, "AAPL,connector", &len);
         if (conn && (strcmp(conn, "infrared") == 0))
                 port_type = PMAC_SCC_IRDA;
-        else if (device_is_compatible(np, "cobalt"))
+        else if (of_device_is_compatible(np, "cobalt"))
                 modem = 1;
         else if (slots && slots->count > 0) {
                 if (strcmp(slots->name, "IrDA") == 0)
@@ -2787,7 +2787,7 @@ set_initial_features(void)
                  */
                 np = of_find_node_by_name(NULL, "ethernet");
                 while(np) {
-                        if (device_is_compatible(np, "K2-GMAC"))
+                        if (of_device_is_compatible(np, "K2-GMAC"))
                                 g5_gmac_enable(np, 0, 1);
                         np = of_find_node_by_name(np, "ethernet");
                 }
@@ -2799,7 +2799,7 @@ set_initial_features(void)
                  */
                 np = of_find_node_by_name(NULL, "firewire");
                 while(np) {
-                        if (device_is_compatible(np, "pci106b,5811")) {
+                        if (of_device_is_compatible(np, "pci106b,5811")) {
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 g5_fw_enable(np, 0, 1);
                         }
@@ -2817,8 +2817,8 @@ set_initial_features(void)
                 np = of_find_node_by_name(NULL, "ethernet");
                 while(np) {
                         if (np->parent
-                            && device_is_compatible(np->parent, "uni-north")
-                            && device_is_compatible(np, "gmac"))
+                            && of_device_is_compatible(np->parent, "uni-north")
+                            && of_device_is_compatible(np, "gmac"))
                                 core99_gmac_enable(np, 0, 1);
                         np = of_find_node_by_name(np, "ethernet");
                 }
@@ -2831,10 +2831,10 @@ set_initial_features(void)
                 np = of_find_node_by_name(NULL, "firewire");
                 while(np) {
                         if (np->parent
-                            && device_is_compatible(np->parent, "uni-north")
-                            && (device_is_compatible(np, "pci106b,18") ||
-                                device_is_compatible(np, "pci106b,30") ||
-                                device_is_compatible(np, "pci11c1,5811"))) {
+                            && of_device_is_compatible(np->parent, "uni-north")
+                            && (of_device_is_compatible(np, "pci106b,18") ||
+                                of_device_is_compatible(np, "pci106b,30") ||
+                                of_device_is_compatible(np, "pci11c1,5811"))) {
                                 macio_chips[0].flags |= MACIO_FLAG_FW_SUPPORTED;
                                 core99_firewire_enable(np, 0, 1);
                         }
@@ -2845,8 +2845,8 @@ set_initial_features(void)
                 np = of_find_node_by_name(NULL, "ata-6");
                 while(np) {
                         if (np->parent
-                            && device_is_compatible(np->parent, "uni-north")
-                            && device_is_compatible(np, "kauai-ata")) {
+                            && of_device_is_compatible(np->parent, "uni-north")
+                            && of_device_is_compatible(np, "kauai-ata")) {
                                 core99_ata100_enable(np, 1);
                         }
                         np = of_find_node_by_name(np, "ata-6");
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 5430e146b3e9..3f507ab9c5e5 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -1207,7 +1207,7 @@ static void pmac_i2c_devscan(void (*callback)(struct device_node *dev,
                                 if (strcmp(np->name, p->name))
                                         continue;
                                 if (p->compatible &&
-                                    !device_is_compatible(np, p->compatible))
+                                    !of_device_is_compatible(np, p->compatible))
                                         continue;
                                 if (p->quirks & pmac_i2c_quirk_skip)
                                         break;
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 692945c14919..c6f0f9e738e5 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -553,7 +553,7 @@ static int __init core99_nvram_setup(struct device_node *dp, unsigned long addr)
          * identify the chip using flash id commands and base ourselves on
          * a list of known chips IDs
          */
-        if (device_is_compatible(dp, "amd-0137")) {
+        if (of_device_is_compatible(dp, "amd-0137")) {
                 core99_erase_bank = amd_erase_bank;
                 core99_write_bank = amd_write_bank;
         } else {
@@ -588,7 +588,7 @@ int __init pmac_nvram_init(void)
                 }
         }
 
-        is_core_99 = device_is_compatible(dp, "nvram,flash");
+        is_core_99 = of_device_is_compatible(dp, "nvram,flash");
         if (is_core_99) {
                 err = core99_nvram_setup(dp, r1.start);
                 goto bail;
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 22c4ae4c6934..c4af9e21ac93 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -934,15 +934,15 @@ static int __init add_bridge(struct device_node *dev)
 
         /* 64 bits only bridges */
 #ifdef CONFIG_PPC64
-        if (device_is_compatible(dev, "u3-agp")) {
+        if (of_device_is_compatible(dev, "u3-agp")) {
                 setup_u3_agp(hose);
                 disp_name = "U3-AGP";
                 primary = 0;
-        } else if (device_is_compatible(dev, "u3-ht")) {
+        } else if (of_device_is_compatible(dev, "u3-ht")) {
                 setup_u3_ht(hose);
                 disp_name = "U3-HT";
                 primary = 1;
-        } else if (device_is_compatible(dev, "u4-pcie")) {
+        } else if (of_device_is_compatible(dev, "u4-pcie")) {
                 setup_u4_pcie(hose);
                 disp_name = "U4-PCIE";
                 primary = 0;
@@ -953,7 +953,7 @@ static int __init add_bridge(struct device_node *dev)
 
         /* 32 bits only bridges */
 #ifdef CONFIG_PPC32
-        if (device_is_compatible(dev, "uni-north")) {
+        if (of_device_is_compatible(dev, "uni-north")) {
                 primary = setup_uninorth(hose, &rsrc);
                 disp_name = "UniNorth";
         } else if (strcmp(dev->name, "pci") == 0) {
@@ -1129,21 +1129,21 @@ pmac_pci_enable_device_hook(struct pci_dev *dev, int initial)
                 return 0;
 
         uninorth_child = node->parent &&
-                device_is_compatible(node->parent, "uni-north");
+                of_device_is_compatible(node->parent, "uni-north");
 
         /* Firewire & GMAC were disabled after PCI probe, the driver is
          * claiming them, we must re-enable them now.
          */
         if (uninorth_child && !strcmp(node->name, "firewire") &&
-            (device_is_compatible(node, "pci106b,18") ||
-             device_is_compatible(node, "pci106b,30") ||
-             device_is_compatible(node, "pci11c1,5811"))) {
+            (of_device_is_compatible(node, "pci106b,18") ||
+             of_device_is_compatible(node, "pci106b,30") ||
+             of_device_is_compatible(node, "pci11c1,5811"))) {
                 pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, node, 0, 1);
                 pmac_call_feature(PMAC_FTR_1394_ENABLE, node, 0, 1);
                 updatecfg = 1;
         }
         if (uninorth_child && !strcmp(node->name, "ethernet") &&
-            device_is_compatible(node, "gmac")) {
+            of_device_is_compatible(node, "gmac")) {
                 pmac_call_feature(PMAC_FTR_GMAC_ENABLE, node, 0, 1);
                 updatecfg = 1;
         }
@@ -1203,18 +1203,18 @@ void __init pmac_pcibios_after_init(void)
 #endif /* CONFIG_BLK_DEV_IDE */
 
         for_each_node_by_name(nd, "firewire") {
-                if (nd->parent && (device_is_compatible(nd, "pci106b,18") ||
-                                   device_is_compatible(nd, "pci106b,30") ||
-                                   device_is_compatible(nd, "pci11c1,5811"))
-                    && device_is_compatible(nd->parent, "uni-north")) {
+                if (nd->parent && (of_device_is_compatible(nd, "pci106b,18") ||
+                                   of_device_is_compatible(nd, "pci106b,30") ||
+                                   of_device_is_compatible(nd, "pci11c1,5811"))
+                    && of_device_is_compatible(nd->parent, "uni-north")) {
                         pmac_call_feature(PMAC_FTR_1394_ENABLE, nd, 0, 0);
                         pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, nd, 0, 0);
                 }
         }
         of_node_put(nd);
         for_each_node_by_name(nd, "ethernet") {
-                if (nd->parent && device_is_compatible(nd, "gmac")
-                    && device_is_compatible(nd->parent, "uni-north"))
+                if (nd->parent && of_device_is_compatible(nd, "gmac")
+                    && of_device_is_compatible(nd->parent, "uni-north"))
                         pmac_call_feature(PMAC_FTR_GMAC_ENABLE, nd, 0, 0);
         }
         of_node_put(nd);
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index ae5097ac0378..87cd6805171a 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -364,7 +364,7 @@ static void __init pmac_pic_probe_oldstyle(void)
                 slave = of_find_node_by_name(master, "mac-io");
 
                 /* Check ordering of master & slave */
-                if (device_is_compatible(master, "gatwick")) {
+                if (of_device_is_compatible(master, "gatwick")) {
                         struct device_node *tmp;
                         BUG_ON(slave == NULL);
                         tmp = master;
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index b820cabac697..a410bc76a8a8 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -439,76 +439,14 @@ static void __init find_boot_device(void)
 #endif
 }
 
-/* TODO: Merge the suspend-to-ram with the common code !!!
- * currently, this is a stub implementation for suspend-to-disk
- * only
- */
-
-#ifdef CONFIG_SOFTWARE_SUSPEND
-
-static int pmac_pm_prepare(suspend_state_t state)
-{
-        printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);
-
-        return 0;
-}
-
-static int pmac_pm_enter(suspend_state_t state)
-{
-        printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);
-
-        /* Giveup the lazy FPU & vec so we don't have to back them
-         * up from the low level code
-         */
-        enable_kernel_fp();
-
-#ifdef CONFIG_ALTIVEC
-        if (cur_cpu_spec->cpu_features & CPU_FTR_ALTIVEC)
-                enable_kernel_altivec();
-#endif /* CONFIG_ALTIVEC */
-
-        return 0;
-}
-
-static int pmac_pm_finish(suspend_state_t state)
-{
-        printk(KERN_DEBUG "%s(%d)\n", __FUNCTION__, state);
-
-        /* Restore userland MMU context */
-        set_context(current->active_mm->context.id, current->active_mm->pgd);
-
-        return 0;
-}
-
-static int pmac_pm_valid(suspend_state_t state)
-{
-        switch (state) {
-        case PM_SUSPEND_DISK:
-                return 1;
-        /* can't do any other states via generic mechanism yet */
-        default:
-                return 0;
-        }
-}
-
-static struct pm_ops pmac_pm_ops = {
-        .pm_disk_mode   = PM_DISK_SHUTDOWN,
-        .prepare        = pmac_pm_prepare,
-        .enter          = pmac_pm_enter,
-        .finish         = pmac_pm_finish,
-        .valid          = pmac_pm_valid,
-};
-
-#endif /* CONFIG_SOFTWARE_SUSPEND */
-
 static int initializing = 1;
 
 static int pmac_late_init(void)
 {
         initializing = 0;
-#ifdef CONFIG_SOFTWARE_SUSPEND
-        pm_set_ops(&pmac_pm_ops);
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+        /* this is udbg (which is __init) and we can later use it during
+         * cpu hotplug (in smp_core99_kick_cpu) */
+        ppc_md.progress = NULL;
         return 0;
 }
 
@@ -721,12 +659,57 @@ static int pmac_pci_probe_mode(struct pci_bus *bus)
         /* 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") ||
-                                  device_is_compatible(node, "u4-pcie")))
+        if (bus->self == NULL && (of_device_is_compatible(node, "u3-agp") ||
+                                  of_device_is_compatible(node, "u4-pcie")))
                 return PCI_PROBE_NORMAL;
         return PCI_PROBE_DEVTREE;
 }
-#endif
+
+#ifdef CONFIG_HOTPLUG_CPU
+/* access per cpu vars from generic smp.c */
+DECLARE_PER_CPU(int, cpu_state);
+
+static void pmac_cpu_die(void)
+{
+        /*
+         * turn off as much as possible, we'll be
+         * kicked out as this will only be invoked
+         * on core99 platforms for now ...
+         */
+
+        printk(KERN_INFO "CPU#%d offline\n", smp_processor_id());
+        __get_cpu_var(cpu_state) = CPU_DEAD;
+        smp_wmb();
+
+        /*
+         * during the path that leads here preemption is disabled,
+         * reenable it now so that when coming up preempt count is
+         * zero correctly
+         */
+        preempt_enable();
+
+        /*
+         * hard-disable interrupts for the non-NAP case, the NAP code
+         * needs to re-enable interrupts (but soft-disables them)
+         */
+        hard_irq_disable();
+
+        while (1) {
+                /* let's not take timer interrupts too often ... */
+                set_dec(0x7fffffff);
+
+                /* should always be true at this point */
+                if (cpu_has_feature(CPU_FTR_CAN_NAP))
+                        power4_cpu_offline_powersave();
+                else {
+                        HMT_low();
+                        HMT_very_low();
+                }
+        }
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
+#endif /* CONFIG_PPC64 */
 
 define_machine(powermac) {
         .name                   = "PowerMac",
@@ -763,6 +746,6 @@ define_machine(powermac) {
         .phys_mem_access_prot   = pci_phys_mem_access_prot,
 #endif
 #if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC64)
-        .cpu_die                = generic_mach_cpu_die,
+        .cpu_die                = pmac_cpu_die,
 #endif
 };
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 6f32c4eca6e5..686ed82bde79 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/delay.h>
@@ -562,7 +561,7 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
         /* Look for the clock chip */
         while ((cc = of_find_node_by_name(cc, "i2c-hwclock")) != NULL) {
                 p = of_get_parent(cc);
-                ok = p && device_is_compatible(p, "uni-n-i2c");
+                ok = p && of_device_is_compatible(p, "uni-n-i2c");
                 of_node_put(p);
                 if (!ok)
                         continue;
@@ -575,11 +574,11 @@ static void __init smp_core99_setup_i2c_hwsync(int ncpus)
                         continue;
                 switch (*reg) {
                 case 0xd2:
-                        if (device_is_compatible(cc,"pulsar-legacy-slewing")) {
+                        if (of_device_is_compatible(cc,"pulsar-legacy-slewing")) {
                                 pmac_tb_freeze = smp_core99_pulsar_tb_freeze;
                                 pmac_tb_pulsar_addr = 0xd2;
                                 name = "Pulsar";
-                        } else if (device_is_compatible(cc, "cy28508")) {
+                        } else if (of_device_is_compatible(cc, "cy28508")) {
                                 pmac_tb_freeze = smp_core99_cypress_tb_freeze;
                                 name = "Cypress";
                         }
@@ -900,7 +899,7 @@ void smp_core99_cpu_die(unsigned int cpu)
         cpu_dead[cpu] = 0;
 }
 
-#endif
+#endif /* CONFIG_HOTPLUG_CPU && CONFIG_PP32 */
 
 /* Core99 Macs (dual G4s and G5s) */
 struct smp_ops_t core99_smp_ops = {
@@ -910,8 +909,16 @@ struct smp_ops_t core99_smp_ops = {
         .setup_cpu      = smp_core99_setup_cpu,
         .give_timebase  = smp_core99_give_timebase,
         .take_timebase  = smp_core99_take_timebase,
-#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32)
+#if defined(CONFIG_HOTPLUG_CPU)
+# if defined(CONFIG_PPC32)
         .cpu_disable    = smp_core99_cpu_disable,
         .cpu_die        = smp_core99_cpu_die,
+# endif
+# if defined(CONFIG_PPC64)
+        .cpu_disable    = generic_cpu_disable,
+        .cpu_die        = generic_cpu_die,
+        /* intentionally do *NOT* assign cpu_enable,
+         * the generic code will use kick_cpu then! */
+# endif
 #endif
 };