[S390] Use del_timer instead of del_timer_sync

[safe/jmp/linux-2.6] / drivers / s390 / char / sclp_cmd.c

diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index ec9c0bc..5cc11c6 100644 (file)
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -1,24 +1,28 @@
 /*
- *  drivers/s390/char/sclp_cmd.c
+ * Copyright IBM Corp. 2007, 2009
  *
- *    Copyright IBM Corp. 2007
- *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>,
- *              Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
+ * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>,
+ *           Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "sclp_cmd"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/completion.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/memory.h>
+#include <linux/platform_device.h>
 #include <asm/chpid.h>
 #include <asm/sclp.h>
-#include "sclp.h"
+#include <asm/setup.h>
 
-#define TAG    "sclp_cmd: "
+#include "sclp.h"
 
 #define SCLP_CMDW_READ_SCP_INFO                0x00020001
 #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
@@ -169,8 +173,8 @@ static int do_sync_request(sclp_cmdw_t cmd, void *sccb)
 
        /* Check response. */
        if (request->status != SCLP_REQ_DONE) {
-               printk(KERN_WARNING TAG "sync request failed "
-                      "(cmd=0x%08x, status=0x%02x)\n", cmd, request->status);
+               pr_warning("sync request failed (cmd=0x%08x, "
+                          "status=0x%02x)\n", cmd, request->status);
                rc = -EIO;
        }
 out:
@@ -224,8 +228,8 @@ int sclp_get_cpu_info(struct sclp_cpu_info *info)
        if (rc)
                goto out;
        if (sccb->header.response_code != 0x0010) {
-               printk(KERN_WARNING TAG "readcpuinfo failed "
-                      "(response=0x%04x)\n", sccb->header.response_code);
+               pr_warning("readcpuinfo failed (response=0x%04x)\n",
+                          sccb->header.response_code);
                rc = -EIO;
                goto out;
        }
@@ -262,8 +266,9 @@ static int do_cpu_configure(sclp_cmdw_t cmd)
        case 0x0120:
                break;
        default:
-               printk(KERN_WARNING TAG "configure cpu failed (cmd=0x%08x, "
-                      "response=0x%04x)\n", cmd, sccb->header.response_code);
+               pr_warning("configure cpu failed (cmd=0x%08x, "
+                          "response=0x%04x)\n", cmd,
+                          sccb->header.response_code);
                rc = -EIO;
                break;
        }
@@ -288,6 +293,7 @@ static DEFINE_MUTEX(sclp_mem_mutex);
 static LIST_HEAD(sclp_mem_list);
 static u8 sclp_max_storage_id;
 static unsigned long sclp_storage_ids[256 / BITS_PER_LONG];
+static int sclp_mem_state_changed;
 
 struct memory_increment {
        struct list_head list;
@@ -446,6 +452,8 @@ static int sclp_mem_notifier(struct notifier_block *nb,
                rc = -EINVAL;
                break;
        }
+       if (!rc)
+               sclp_mem_state_changed = 1;
        mutex_unlock(&sclp_mem_mutex);
        return rc ? NOTIFY_BAD : NOTIFY_OK;
 }
@@ -471,6 +479,10 @@ static void __init add_memory_merged(u16 rn)
                goto skip_add;
        if (start + size > VMEM_MAX_PHYS)
                size = VMEM_MAX_PHYS - start;
+       if (memory_end_set && (start >= memory_end))
+               goto skip_add;
+       if (memory_end_set && (start + size > memory_end))
+               size = memory_end - start;
        add_memory(0, start, size);
 skip_add:
        first_rn = rn;
@@ -517,6 +529,14 @@ static void __init insert_increment(u16 rn, int standby, int assigned)
        list_add(&new_incr->list, prev);
 }
 
+static int sclp_mem_freeze(struct device *dev)
+{
+       if (!sclp_mem_state_changed)
+               return 0;
+       pr_err("Memory hotplug state changed, suspend refused.\n");
+       return -EPERM;
+}
+
 struct read_storage_sccb {
        struct sccb_header header;
        u16 max_id;
@@ -526,8 +546,20 @@ struct read_storage_sccb {
        u32 entries[0];
 } __packed;
 
+static struct dev_pm_ops sclp_mem_pm_ops = {
+       .freeze         = sclp_mem_freeze,
+};
+
+static struct platform_driver sclp_mem_pdrv = {
+       .driver = {
+               .name   = "sclp_mem",
+               .pm     = &sclp_mem_pm_ops,
+       },
+};
+
 static int __init sclp_detect_standby_memory(void)
 {
+       struct platform_device *sclp_pdev;
        struct read_storage_sccb *sccb;
        int i, id, assigned, rc;
 
@@ -580,7 +612,17 @@ static int __init sclp_detect_standby_memory(void)
        rc = register_memory_notifier(&sclp_mem_nb);
        if (rc)
                goto out;
+       rc = platform_driver_register(&sclp_mem_pdrv);
+       if (rc)
+               goto out;
+       sclp_pdev = platform_device_register_simple("sclp_mem", -1, NULL, 0);
+       rc = IS_ERR(sclp_pdev) ? PTR_ERR(sclp_pdev) : 0;
+       if (rc)
+               goto out_driver;
        sclp_add_standby_memory();
+       goto out;
+out_driver:
+       platform_driver_unregister(&sclp_mem_pdrv);
 out:
        free_page((unsigned long) sccb);
        return rc;
@@ -626,9 +668,9 @@ static int do_chp_configure(sclp_cmdw_t cmd)
        case 0x0450:
                break;
        default:
-               printk(KERN_WARNING TAG "configure channel-path failed "
-                      "(cmd=0x%08x, response=0x%04x)\n", cmd,
-                      sccb->header.response_code);
+               pr_warning("configure channel-path failed "
+                          "(cmd=0x%08x, response=0x%04x)\n", cmd,
+                          sccb->header.response_code);
                rc = -EIO;
                break;
        }
@@ -695,8 +737,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info)
        if (rc)
                goto out;
        if (sccb->header.response_code != 0x0010) {
-               printk(KERN_WARNING TAG "read channel-path info failed "
-                      "(response=0x%04x)\n", sccb->header.response_code);
+               pr_warning("read channel-path info failed "
+                          "(response=0x%04x)\n", sccb->header.response_code);
                rc = -EIO;
                goto out;
        }