Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...
[linux-2.6.git] / drivers / s390 / char / sclp_cmd.c
index eb5f1b8..231a1d8 100644 (file)
@@ -1,24 +1,29 @@
 /*
- *  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>
+#include <asm/ctl_reg.h>
 
-#define TAG    "sclp_cmd: "
+#include "sclp.h"
 
 #define SCLP_CMDW_READ_SCP_INFO                0x00020001
 #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001
@@ -57,8 +62,8 @@ static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
        rc = sclp_service_call(cmd, sccb);
        if (rc)
                goto out;
-       __load_psw_mask(PSW_BASE_BITS | PSW_MASK_EXT |
-                       PSW_MASK_WAIT | PSW_DEFAULT_KEY);
+       __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
+                       PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
        local_irq_disable();
 out:
        /* Contents of the sccb might have changed. */
@@ -80,6 +85,7 @@ static void __init sclp_read_info_early(void)
                do {
                        memset(sccb, 0, sizeof(*sccb));
                        sccb->header.length = sizeof(*sccb);
+                       sccb->header.function_code = 0x80;
                        sccb->header.control_mask[2] = 0x80;
                        rc = sclp_cmd_sync_early(commands[i], sccb);
                } while (rc == -EBUSY);
@@ -169,8 +175,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 +230,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 +268,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 +295,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;
@@ -301,6 +309,13 @@ struct assign_storage_sccb {
        u16 rn;
 } __packed;
 
+int arch_get_memory_phys_device(unsigned long start_pfn)
+{
+       if (!rzm)
+               return 0;
+       return PFN_PHYS(start_pfn) >> ilog2(rzm);
+}
+
 static unsigned long long rn2addr(u16 rn)
 {
        return (unsigned long long) (rn - 1) * rzm;
@@ -324,6 +339,9 @@ static int do_assign_storage(sclp_cmdw_t cmd, u16 rn)
        case 0x0120:
                break;
        default:
+               pr_warning("assign storage failed (cmd=0x%08x, "
+                          "response=0x%04x, rn=0x%04x)\n", cmd,
+                          sccb->header.response_code, rn);
                rc = -EIO;
                break;
        }
@@ -366,8 +384,10 @@ static int sclp_attach_storage(u8 id)
        switch (sccb->header.response_code) {
        case 0x0020:
                set_bit(id, sclp_storage_ids);
-               for (i = 0; i < sccb->assigned; i++)
-                       sclp_unassign_storage(sccb->entries[i] >> 16);
+               for (i = 0; i < sccb->assigned; i++) {
+                       if (sccb->entries[i])
+                               sclp_unassign_storage(sccb->entries[i] >> 16);
+               }
                break;
        default:
                rc = -EIO;
@@ -422,9 +442,8 @@ static int sclp_mem_notifier(struct notifier_block *nb,
        start = arg->start_pfn << PAGE_SHIFT;
        size = arg->nr_pages << PAGE_SHIFT;
        mutex_lock(&sclp_mem_mutex);
-       for (id = 0; id <= sclp_max_storage_id; id++)
-               if (!test_bit(id, sclp_storage_ids))
-                       sclp_attach_storage(id);
+       for_each_clear_bit(id, sclp_storage_ids, sclp_max_storage_id + 1)
+               sclp_attach_storage(id);
        switch (action) {
        case MEM_ONLINE:
        case MEM_GOING_OFFLINE:
@@ -443,6 +462,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;
 }
@@ -468,6 +489,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;
@@ -495,6 +520,8 @@ static void __init insert_increment(u16 rn, int standby, int assigned)
                return;
        new_incr->rn = rn;
        new_incr->standby = standby;
+       if (!standby)
+               new_incr->usecount = 1;
        last_rn = 0;
        prev = &sclp_mem_list;
        list_for_each_entry(incr, &sclp_mem_list, list) {
@@ -514,6 +541,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;
@@ -523,8 +558,20 @@ struct read_storage_sccb {
        u32 entries[0];
 } __packed;
 
+static const 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;
 
@@ -577,7 +624,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;
@@ -623,9 +680,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;
        }
@@ -692,8 +749,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;
        }