6 files changed, 259 insertions, 9 deletions

diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 14e8cce9f862..6377a96735df 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SCLP_CPI) += sclp_cpi.o
 
 obj-$(CONFIG_ZVM_WATCHDOG) += vmwatchdog.o
 obj-$(CONFIG_VMLOGRDR) += vmlogrdr.o
+obj-$(CONFIG_VMCP) += vmcp.o
 
 tape-$(CONFIG_S390_TAPE_BLOCK) += tape_block.o
 tape-$(CONFIG_PROC_FS) += tape_proc.o
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 022f17bff731..f11a67fda40e 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -860,8 +860,8 @@ con3215_init(void)
 
         /* Set the console mode for VM */
         if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3215", NULL, 0);
-                cpcmd("TERM AUTOCR OFF", NULL, 0);
+                cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
         }
 
         /* allocate 3215 request structures */
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index d52fb57a6b19..fc7a213e591f 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -591,8 +591,8 @@ con3270_init(void)
 
         /* Set the console mode for VM */
         if (MACHINE_IS_VM) {
-                cpcmd("TERM CONMODE 3270", 0, 0);
-                cpcmd("TERM AUTOCR OFF", 0, 0);
+                cpcmd("TERM CONMODE 3270", NULL, 0, NULL);
+                cpcmd("TERM AUTOCR OFF", NULL, 0, NULL);
         }
 
         cdev = ccw_device_probe_console();
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c
new file mode 100644
index 000000000000..dfbbf235ca2b
--- /dev/null
+++ b/drivers/s390/char/vmcp.c
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2004,2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+
+ * The idea of this driver is based on cpint from Neale Ferguson and #CP in CMS
+ */
+
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <asm/cpcmd.h>
+#include <asm/debug.h>
+#include <asm/uaccess.h>
+#include "vmcp.h"
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Borntraeger <cborntra@de.ibm.com>");
+MODULE_DESCRIPTION("z/VM CP interface");
+
+static debug_info_t *vmcp_debug;
+
+static int vmcp_open(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+
+        if (!capable(CAP_SYS_ADMIN))
+                return -EPERM;
+
+        session = kmalloc(sizeof(*session), GFP_KERNEL);
+        if (!session)
+                return -ENOMEM;
+        session->bufsize = PAGE_SIZE;
+        session->response = NULL;
+        session->resp_size = 0;
+        init_MUTEX(&session->mutex);
+        file->private_data = session;
+        return nonseekable_open(inode, file);
+}
+
+static int vmcp_release(struct inode *inode, struct file *file)
+{
+        struct vmcp_session *session;
+
+        session = (struct vmcp_session *)file->private_data;
+        file->private_data = NULL;
+        free_pages((unsigned long)session->response, get_order(session->bufsize));
+        kfree(session);
+        return 0;
+}
+
+static ssize_t
+vmcp_read(struct file *file, char __user * buff, size_t count, loff_t * ppos)
+{
+        size_t tocopy;
+        struct vmcp_session *session;
+
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response) {
+                up(&session->mutex);
+                return 0;
+        }
+        if (*ppos > session->resp_size) {
+                up(&session->mutex);
+                return 0;
+        }
+        tocopy = min(session->resp_size - (size_t) (*ppos), count);
+        tocopy = min(tocopy,session->bufsize - (size_t) (*ppos));
+
+        if (copy_to_user(buff, session->response + (*ppos), tocopy)) {
+                up(&session->mutex);
+                return -EFAULT;
+        }
+        up(&session->mutex);
+        *ppos += tocopy;
+        return tocopy;
+}
+
+static ssize_t
+vmcp_write(struct file *file, const char __user * buff, size_t count,
+           loff_t * ppos)
+{
+        char *cmd;
+        struct vmcp_session *session;
+
+        if (count > 240)
+                return -EINVAL;
+        cmd = kmalloc(count + 1, GFP_KERNEL);
+        if (!cmd)
+                return -ENOMEM;
+        if (copy_from_user(cmd, buff, count)) {
+                kfree(cmd);
+                return -EFAULT;
+        }
+        cmd[count] = '\0';
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        if (!session->response)
+                session->response = (char *)__get_free_pages(GFP_KERNEL
+                                                | __GFP_REPEAT  | GFP_DMA,
+                                                get_order(session->bufsize));
+        if (!session->response) {
+                up(&session->mutex);
+                kfree(cmd);
+                return -ENOMEM;
+        }
+        debug_text_event(vmcp_debug, 1, cmd);
+        session->resp_size = cpcmd(cmd, session->response,
+                                   session->bufsize,
+                                   &session->resp_code);
+        up(&session->mutex);
+        kfree(cmd);
+        *ppos = 0;              /* reset the file pointer after a command */
+        return count;
+}
+
+
+/*
+ * These ioctls are available, as the semantics of the diagnose 8 call
+ * does not fit very well into a Linux call. Diagnose X'08' is described in
+ * CP Programming Services SC24-6084-00
+ *
+ * VMCP_GETCODE: gives the CP return code back to user space
+ * VMCP_SETBUF: sets the response buffer for the next write call. diagnose 8
+ * expects adjacent pages in real storage and to make matters worse, we
+ * dont know the size of the response. Therefore we default to PAGESIZE and
+ * let userspace to change the response size, if userspace expects a bigger
+ * response
+ */
+static long vmcp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct vmcp_session *session;
+        int temp;
+
+        session = (struct vmcp_session *)file->private_data;
+        if (down_interruptible(&session->mutex))
+                return -ERESTARTSYS;
+        switch (cmd) {
+        case VMCP_GETCODE:
+                temp = session->resp_code;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        case VMCP_SETBUF:
+                free_pages((unsigned long)session->response,
+                                get_order(session->bufsize));
+                session->response=NULL;
+                temp = get_user(session->bufsize, (int __user *)arg);
+                if (get_order(session->bufsize) > 8) {
+                        session->bufsize = PAGE_SIZE;
+                        temp = -EINVAL;
+                }
+                up(&session->mutex);
+                return temp;
+        case VMCP_GETSIZE:
+                temp = session->resp_size;
+                up(&session->mutex);
+                return put_user(temp, (int __user *)arg);
+        default:
+                up(&session->mutex);
+                return -ENOIOCTLCMD;
+        }
+}
+
+static struct file_operations vmcp_fops = {
+        .owner          = THIS_MODULE,
+        .open           = &vmcp_open,
+        .release        = &vmcp_release,
+        .read           = &vmcp_read,
+        .llseek         = &no_llseek,
+        .write          = &vmcp_write,
+        .unlocked_ioctl = &vmcp_ioctl,
+        .compat_ioctl   = &vmcp_ioctl
+};
+
+static struct miscdevice vmcp_dev = {
+        .name   = "vmcp",
+        .minor  = MISC_DYNAMIC_MINOR,
+        .fops   = &vmcp_fops,
+};
+
+static int __init vmcp_init(void)
+{
+        int ret;
+
+        if (!MACHINE_IS_VM) {
+                printk(KERN_WARNING
+                       "z/VM CP interface is only available under z/VM\n");
+                return -ENODEV;
+        }
+        ret = misc_register(&vmcp_dev);
+        if (!ret)
+                printk(KERN_INFO "z/VM CP interface loaded\n");
+        else
+                printk(KERN_WARNING
+                       "z/VM CP interface not loaded. Could not register misc device.\n");
+        vmcp_debug = debug_register("vmcp", 0, 1, 240);
+        debug_register_view(vmcp_debug, &debug_hex_ascii_view);
+        return ret;
+}
+
+static void __exit vmcp_exit(void)
+{
+        WARN_ON(misc_deregister(&vmcp_dev) != 0);
+        debug_unregister(vmcp_debug);
+        printk(KERN_INFO "z/VM CP interface unloaded.\n");
+}
+
+module_init(vmcp_init);
+module_exit(vmcp_exit);
diff --git a/drivers/s390/char/vmcp.h b/drivers/s390/char/vmcp.h
new file mode 100644
index 000000000000..87389e730465
--- /dev/null
+++ b/drivers/s390/char/vmcp.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2004, 2005 IBM Corporation
+ * Interface implementation for communication with the v/VM control program
+ * Version 1.0
+ * Author(s): Christian Borntraeger <cborntra@de.ibm.com>
+ *
+ *
+ * z/VMs CP offers the possibility to issue commands via the diagnose code 8
+ * this driver implements a character device that issues these commands and
+ * returns the answer of CP.
+ *
+ * The idea of this driver is based on cpint from Neale Ferguson
+ */
+
+#include <asm/semaphore.h>
+#include <linux/ioctl.h>
+
+#define VMCP_GETCODE _IOR(0x10, 1, int)
+#define VMCP_SETBUF _IOW(0x10, 2, int)
+#define VMCP_GETSIZE _IOR(0x10, 3, int)
+
+struct vmcp_session {
+        unsigned int bufsize;
+        char *response;
+        int resp_size;
+        int resp_code;
+        /* As we use copy_from/to_user, which might     *
+         * sleep and cannot use a spinlock              */
+        struct semaphore mutex;
+};
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index f7717327d15e..491f00c032e8 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -236,7 +236,7 @@ vmlogrdr_get_recording_class_AB(void) {
         int len,i;
 
         printk (KERN_DEBUG "vmlogrdr: query command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: response: %s", cp_response);
         len = strnlen(cp_response,sizeof(cp_response));
         // now the parsing
@@ -288,7 +288,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
 
                 printk (KERN_DEBUG "vmlogrdr: recording command: %s\n",
                         cp_command);
-                cpcmd(cp_command, cp_response, sizeof(cp_response));
+                cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
                 printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                         cp_response);
         }
@@ -301,7 +301,7 @@ vmlogrdr_recording(struct vmlogrdr_priv_t * logptr, int action, int purge) {
                 qid_string);
 
         printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                 cp_response);
         /* The recording command will usually answer with 'Command complete'
@@ -607,7 +607,7 @@ vmlogrdr_purge_store(struct device * dev, struct device_attribute *attr, const c
                          priv->recording_name);
 
         printk (KERN_DEBUG "vmlogrdr: recording command: %s\n", cp_command);
-        cpcmd(cp_command, cp_response, sizeof(cp_response));
+        cpcmd(cp_command, cp_response, sizeof(cp_response), NULL);
         printk (KERN_DEBUG "vmlogrdr: recording response: %s",
                 cp_response);
 
@@ -682,7 +682,7 @@ vmlogrdr_recording_status_show(struct device_driver *driver, char *buf) {
         char cp_command[] = "QUERY RECORDING ";
         int len;
 
-        cpcmd(cp_command, buf, 4096);
+        cpcmd(cp_command, buf, 4096, NULL);
         len = strlen(buf);
         return len;
 }