9 files changed, 243 insertions, 20 deletions

diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 3dbef309bc8..046ace9c438 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -26,3 +26,7 @@ obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
 obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
 obj-$(CONFIG_CMM)               += cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
+
+ifeq ($(CONFIG_PPC_PSERIES),y)
+obj-$(CONFIG_SUSPEND)           += suspend.o
+endif
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index d71e5858408..227c1c3d585 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -463,6 +463,7 @@ static int dlpar_offline_cpu(struct device_node *dn)
                                 break;
 
                         if (get_cpu_current_state(cpu) == CPU_STATE_ONLINE) {
+                                set_preferred_offline_state(cpu, CPU_STATE_OFFLINE);
                                 cpu_maps_update_done();
                                 rc = cpu_down(cpu);
                                 if (rc)
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index 30b987b73c2..8ed0d2d0e1b 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -288,8 +288,7 @@ void __init pci_addr_cache_build(void)
 
         spin_lock_init(&pci_io_addr_cache_root.piar_lock);
 
-        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-
+        for_each_pci_dev(dev) {
                 pci_addr_cache_insert_device(dev);
 
                 dn = pci_device_to_OF_node(dev);
diff --git a/arch/powerpc/platforms/pseries/event_sources.c b/arch/powerpc/platforms/pseries/event_sources.c
index e889c9d9586..2605c310166 100644
--- a/arch/powerpc/platforms/pseries/event_sources.c
+++ b/arch/powerpc/platforms/pseries/event_sources.c
@@ -41,9 +41,12 @@ void request_event_sources_irqs(struct device_node *np,
                         if (count > 15)
                                 break;
                         virqs[count] = irq_create_mapping(NULL, *(opicprop++));
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
+                        if (virqs[count] == NO_IRQ) {
+                                pr_err("event-sources: Unable to allocate "
+                                       "interrupt number for %s\n",
+                                       np->full_name);
+                                WARN_ON(1);
+                        }
                         else
                                 count++;
 
@@ -59,9 +62,12 @@ void request_event_sources_irqs(struct device_node *np,
                         virqs[count] = irq_create_of_mapping(oirq.controller,
                                                             oirq.specifier,
                                                             oirq.size);
-                        if (virqs[count] == NO_IRQ)
-                                printk(KERN_ERR "Unable to allocate interrupt "
-                                       "number for %s\n", np->full_name);
+                        if (virqs[count] == NO_IRQ) {
+                                pr_err("event-sources: Unable to allocate "
+                                       "interrupt number for %s\n",
+                                       np->full_name);
+                                WARN_ON(1);
+                        }
                         else
                                 count++;
                 }
@@ -70,8 +76,9 @@ void request_event_sources_irqs(struct device_node *np,
         /* Now request them */
         for (i = 0; i < count; i++) {
                 if (request_irq(virqs[i], handler, 0, name, NULL)) {
-                        printk(KERN_ERR "Unable to request interrupt %d for "
-                               "%s\n", virqs[i], np->full_name);
+                        pr_err("event-sources: Unable to request interrupt "
+                               "%d for %s\n", virqs[i], np->full_name);
+                        WARN_ON(1);
                         return;
                 }
         }
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 8f85f399ab9..fd50ccd4bac 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -116,6 +116,9 @@ static void pseries_mach_cpu_die(void)
 
         if (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
                 set_cpu_current_state(cpu, CPU_STATE_INACTIVE);
+                if (ppc_md.suspend_disable_cpu)
+                        ppc_md.suspend_disable_cpu();
+
                 cede_latency_hint = 2;
 
                 get_lppaca()->idle = 1;
@@ -190,12 +193,12 @@ static void pseries_cpu_die(unsigned int cpu)
 
         if (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
                 cpu_status = 1;
-                for (tries = 0; tries < 1000; tries++) {
+                for (tries = 0; tries < 5000; tries++) {
                         if (get_cpu_current_state(cpu) == CPU_STATE_INACTIVE) {
                                 cpu_status = 0;
                                 break;
                         }
-                        cpu_relax();
+                        msleep(1);
                 }
         } else if (get_preferred_offline_state(cpu) == CPU_STATE_OFFLINE) {
 
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 41a3e9a039e..a4fc6da87c2 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -61,7 +61,6 @@ static int ras_check_exception_token;
 
 #define EPOW_SENSOR_TOKEN       9
 #define EPOW_SENSOR_INDEX       0
-#define RAS_VECTOR_OFFSET       0x500
 
 static irqreturn_t ras_epow_interrupt(int irq, void *dev_id);
 static irqreturn_t ras_error_interrupt(int irq, void *dev_id);
@@ -121,7 +120,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)
         spin_lock(&ras_log_buf_lock);
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
-                           RAS_VECTOR_OFFSET,
+                           RTAS_VECTOR_EXTERNAL_INTERRUPT,
                            irq_map[irq].hwirq,
                            RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,
                            critical, __pa(&ras_log_buf),
@@ -156,7 +155,7 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
         spin_lock(&ras_log_buf_lock);
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
-                           RAS_VECTOR_OFFSET,
+                           RTAS_VECTOR_EXTERNAL_INTERRUPT,
                            irq_map[irq].hwirq,
                            RTAS_INTERNAL_ERROR, 1 /*Time Critical */,
                            __pa(&ras_log_buf),
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 1a58637bcea..57ddbb43b33 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -118,12 +118,10 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
         if (!np)
                 goto out_err;
 
-        np->full_name = kmalloc(strlen(path) + 1, GFP_KERNEL);
+        np->full_name = kstrdup(path, GFP_KERNEL);
         if (!np->full_name)
                 goto out_err;
 
-        strcpy(np->full_name, path);
-
         np->properties = proplist;
         of_node_set_flag(np, OF_DYNAMIC);
         kref_init(&np->kref);
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
new file mode 100644
index 00000000000..ed72098bb4e
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -0,0 +1,214 @@
+/*
+  * Copyright (C) 2010 Brian King IBM Corporation
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  */
+
+#include <linux/delay.h>
+#include <linux/suspend.h>
+#include <asm/firmware.h>
+#include <asm/hvcall.h>
+#include <asm/machdep.h>
+#include <asm/mmu.h>
+#include <asm/rtas.h>
+
+static u64 stream_id;
+static struct sys_device suspend_sysdev;
+static DECLARE_COMPLETION(suspend_work);
+static struct rtas_suspend_me_data suspend_data;
+static atomic_t suspending;
+
+/**
+ * pseries_suspend_begin - First phase of hibernation
+ *
+ * Check to ensure we are in a valid state to hibernate
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_begin(suspend_state_t state)
+{
+        long vasi_state, rc;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+
+        /* Make sure the state is valid */
+        rc = plpar_hcall(H_VASI_STATE, retbuf, stream_id);
+
+        vasi_state = retbuf[0];
+
+        if (rc) {
+                pr_err("pseries_suspend_begin: vasi_state returned %ld\n",rc);
+                return rc;
+        } else if (vasi_state == H_VASI_ENABLED) {
+                return -EAGAIN;
+        } else if (vasi_state != H_VASI_SUSPENDING) {
+                pr_err("pseries_suspend_begin: vasi_state returned state %ld\n",
+                       vasi_state);
+                return -EIO;
+        }
+
+        return 0;
+}
+
+/**
+ * pseries_suspend_cpu - Suspend a single CPU
+ *
+ * Makes the H_JOIN call to suspend the CPU
+ *
+ **/
+static int pseries_suspend_cpu(void)
+{
+        if (atomic_read(&suspending))
+                return rtas_suspend_cpu(&suspend_data);
+        return 0;
+}
+
+/**
+ * pseries_suspend_enter - Final phase of hibernation
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_enter(suspend_state_t state)
+{
+        int rc = rtas_suspend_last_cpu(&suspend_data);
+
+        atomic_set(&suspending, 0);
+        atomic_set(&suspend_data.done, 1);
+        return rc;
+}
+
+/**
+ * pseries_prepare_late - Prepare to suspend all other CPUs
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_prepare_late(void)
+{
+        atomic_set(&suspending, 1);
+        atomic_set(&suspend_data.working, 0);
+        atomic_set(&suspend_data.done, 0);
+        atomic_set(&suspend_data.error, 0);
+        suspend_data.complete = &suspend_work;
+        INIT_COMPLETION(suspend_work);
+        return 0;
+}
+
+/**
+ * store_hibernate - Initiate partition hibernation
+ * @classdev:   sysdev class struct
+ * @attr:               class device attribute struct
+ * @buf:                buffer
+ * @count:              buffer size
+ *
+ * Write the stream ID received from the HMC to this file
+ * to trigger hibernating the partition
+ *
+ * Return value:
+ *      number of bytes printed to buffer / other on failure
+ **/
+static ssize_t store_hibernate(struct sysdev_class *classdev,
+                               struct sysdev_class_attribute *attr,
+                               const char *buf, size_t count)
+{
+        int rc;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        stream_id = simple_strtoul(buf, NULL, 16);
+
+        do {
+                rc = pseries_suspend_begin(PM_SUSPEND_MEM);
+                if (rc == -EAGAIN)
+                        ssleep(1);
+        } while (rc == -EAGAIN);
+
+        if (!rc)
+                rc = pm_suspend(PM_SUSPEND_MEM);
+
+        stream_id = 0;
+
+        if (!rc)
+                rc = count;
+        return rc;
+}
+
+static SYSDEV_CLASS_ATTR(hibernate, S_IWUSR, NULL, store_hibernate);
+
+static struct sysdev_class suspend_sysdev_class = {
+        .name = "power",
+};
+
+static struct platform_suspend_ops pseries_suspend_ops = {
+        .valid          = suspend_valid_only_mem,
+        .begin          = pseries_suspend_begin,
+        .prepare_late   = pseries_prepare_late,
+        .enter          = pseries_suspend_enter,
+};
+
+/**
+ * pseries_suspend_sysfs_register - Register with sysfs
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int pseries_suspend_sysfs_register(struct sys_device *sysdev)
+{
+        int rc;
+
+        if ((rc = sysdev_class_register(&suspend_sysdev_class)))
+                return rc;
+
+        sysdev->id = 0;
+        sysdev->cls = &suspend_sysdev_class;
+
+        if ((rc = sysdev_class_create_file(&suspend_sysdev_class, &attr_hibernate)))
+                goto class_unregister;
+
+        return 0;
+
+class_unregister:
+        sysdev_class_unregister(&suspend_sysdev_class);
+        return rc;
+}
+
+/**
+ * pseries_suspend_init - initcall for pSeries suspend
+ *
+ * Return value:
+ *      0 on success / other on failure
+ **/
+static int __init pseries_suspend_init(void)
+{
+        int rc;
+
+        if (!machine_is(pseries) || !firmware_has_feature(FW_FEATURE_LPAR))
+                return 0;
+
+        suspend_data.token = rtas_token("ibm,suspend-me");
+        if (suspend_data.token == RTAS_UNKNOWN_SERVICE)
+                return 0;
+
+        if ((rc = pseries_suspend_sysfs_register(&suspend_sysdev)))
+                return rc;
+
+        ppc_md.suspend_disable_cpu = pseries_suspend_cpu;
+        suspend_set_ops(&pseries_suspend_ops);
+        return 0;
+}
+
+__initcall(pseries_suspend_init);
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f19d1946839..5b22b07c8f6 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -549,8 +549,6 @@ static irqreturn_t xics_ipi_dispatch(int cpu)
 {
         unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
 
-        WARN_ON(cpu_is_offline(cpu));
-
         mb();   /* order mmio clearing qirr */
         while (*tgt) {
                 if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION, tgt)) {