7 files changed, 1063 insertions, 157 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f57907a2c7a1..c602b547cc6e 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -622,6 +622,16 @@ config HVC_BEAT
         help
           Toshiba's Cell Reference Set Beat Console device driver
 
+config HVC_IUCV
+        bool "z/VM IUCV Hypervisor console support (VM only)"
+        depends on S390
+        select HVC_DRIVER
+        select IUCV
+        default y
+        help
+          This driver provides a Hypervisor console (HVC) back-end to access
+          a Linux (console) terminal via a z/VM IUCV communication path.
+
 config HVC_XEN
         bool "Xen Hypervisor Console support"
         depends on XEN
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 52e15524af39..9caf5b5ad1c0 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.o
 obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
 obj-$(CONFIG_HVC_IRQ)           += hvc_irq.o
 obj-$(CONFIG_HVC_XEN)           += hvc_xen.o
+obj-$(CONFIG_HVC_IUCV)          += hvc_iucv.o
 obj-$(CONFIG_HVC_UDBG)          += hvc_udbg.o
 obj-$(CONFIG_VIRTIO_CONSOLE)    += virtio_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
new file mode 100644
index 000000000000..5ea7d7713fca
--- /dev/null
+++ b/drivers/char/hvc_iucv.c
@@ -0,0 +1,850 @@
+/*
+ * hvc_iucv.c - z/VM IUCV back-end for the Hypervisor Console (HVC)
+ *
+ * This back-end for HVC provides terminal access via
+ * z/VM IUCV communication paths.
+ *
+ * Copyright IBM Corp. 2008.
+ *
+ * Author(s):   Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
+ */
+#define KMSG_COMPONENT          "hvc_iucv"
+
+#include <linux/types.h>
+#include <asm/ebcdic.h>
+#include <linux/mempool.h>
+#include <linux/module.h>
+#include <linux/tty.h>
+#include <net/iucv/iucv.h>
+
+#include "hvc_console.h"
+
+
+/* HVC backend for z/VM IUCV */
+#define HVC_IUCV_MAGIC          0xc9e4c3e5
+#define MAX_HVC_IUCV_LINES      HVC_ALLOC_TTY_ADAPTERS
+#define MEMPOOL_MIN_NR          (PAGE_SIZE / sizeof(struct iucv_tty_buffer)/4)
+
+/* IUCV TTY message  */
+#define MSG_VERSION             0x02    /* Message version */
+#define MSG_TYPE_ERROR          0x01    /* Error message */
+#define MSG_TYPE_TERMENV        0x02    /* Terminal environment variable */
+#define MSG_TYPE_TERMIOS        0x04    /* Terminal IO struct update */
+#define MSG_TYPE_WINSIZE        0x08    /* Terminal window size update */
+#define MSG_TYPE_DATA           0x10    /* Terminal data */
+
+#define MSG_SIZE(s)             ((s) + offsetof(struct iucv_tty_msg, data))
+struct iucv_tty_msg {
+        u8      version;                /* Message version */
+        u8      type;                   /* Message type */
+#define MSG_MAX_DATALEN         (~(u16)0)
+        u16     datalen;                /* Payload length */
+        u8      data[];                 /* Payload buffer */
+} __attribute__((packed));
+
+enum iucv_state_t {
+        IUCV_DISCONN    = 0,
+        IUCV_CONNECTED  = 1,
+        IUCV_SEVERED    = 2,
+};
+
+enum tty_state_t {
+        TTY_CLOSED      = 0,
+        TTY_OPENED      = 1,
+};
+
+struct hvc_iucv_private {
+        struct hvc_struct       *hvc; /* HVC console struct reference */
+        u8                      srv_name[8];    /* IUCV service name (ebcdic) */
+        enum iucv_state_t       iucv_state;     /* IUCV connection status */
+        enum tty_state_t        tty_state;      /* TTY status */
+        struct iucv_path        *path;          /* IUCV path pointer */
+        spinlock_t              lock;           /* hvc_iucv_private lock */
+        struct list_head        tty_outqueue;   /* outgoing IUCV messages */
+        struct list_head        tty_inqueue;    /* incoming IUCV messages */
+};
+
+struct iucv_tty_buffer {
+        struct list_head        list;   /* list pointer */
+        struct iucv_message     msg;    /* store an incoming IUCV message */
+        size_t                  offset; /* data buffer offset */
+        struct iucv_tty_msg     *mbuf;  /* buffer to store input/output data */
+};
+
+/* IUCV callback handler */
+static  int hvc_iucv_path_pending(struct iucv_path *, u8[8], u8[16]);
+static void hvc_iucv_path_severed(struct iucv_path *, u8[16]);
+static void hvc_iucv_msg_pending(struct iucv_path *, struct iucv_message *);
+static void hvc_iucv_msg_complete(struct iucv_path *, struct iucv_message *);
+
+
+/* Kernel module parameters */
+static unsigned long hvc_iucv_devices;
+
+/* Array of allocated hvc iucv tty lines... */
+static struct hvc_iucv_private *hvc_iucv_table[MAX_HVC_IUCV_LINES];
+
+/* Kmem cache and mempool for iucv_tty_buffer elements */
+static struct kmem_cache *hvc_iucv_buffer_cache;
+static mempool_t *hvc_iucv_mempool;
+
+/* IUCV handler callback functions */
+static struct iucv_handler hvc_iucv_handler = {
+        .path_pending  = hvc_iucv_path_pending,
+        .path_severed  = hvc_iucv_path_severed,
+        .message_complete = hvc_iucv_msg_complete,
+        .message_pending  = hvc_iucv_msg_pending,
+};
+
+
+/**
+ * hvc_iucv_get_private() - Return a struct hvc_iucv_private instance.
+ * @num:        The HVC virtual terminal number (vtermno)
+ *
+ * This function returns the struct hvc_iucv_private instance that corresponds
+ * to the HVC virtual terminal number specified as parameter @num.
+ */
+struct hvc_iucv_private *hvc_iucv_get_private(uint32_t num)
+{
+        if ((num < HVC_IUCV_MAGIC) || (num - HVC_IUCV_MAGIC > hvc_iucv_devices))
+                return NULL;
+        return hvc_iucv_table[num - HVC_IUCV_MAGIC];
+}
+
+/**
+ * alloc_tty_buffer() - Returns a new struct iucv_tty_buffer element.
+ * @size:       Size of the internal buffer used to store data.
+ * @flags:      Memory allocation flags passed to mempool.
+ *
+ * This function allocates a new struct iucv_tty_buffer element and, optionally,
+ * allocates an internal data buffer with the specified size @size.
+ * Note: The total message size arises from the internal buffer size and the
+ *       members of the iucv_tty_msg structure.
+ *
+ * The function returns NULL if memory allocation has failed.
+ */
+static struct iucv_tty_buffer *alloc_tty_buffer(size_t size, gfp_t flags)
+{
+        struct iucv_tty_buffer *bufp;
+
+        bufp = mempool_alloc(hvc_iucv_mempool, flags);
+        if (!bufp)
+                return NULL;
+        memset(bufp, 0, sizeof(struct iucv_tty_buffer));
+
+        if (size > 0) {
+                bufp->msg.length = MSG_SIZE(size);
+                bufp->mbuf = kmalloc(bufp->msg.length, flags);
+                if (!bufp->mbuf) {
+                        mempool_free(bufp, hvc_iucv_mempool);
+                        return NULL;
+                }
+                bufp->mbuf->version = MSG_VERSION;
+                bufp->mbuf->type    = MSG_TYPE_DATA;
+                bufp->mbuf->datalen = (u16) size;
+        }
+        return bufp;
+}
+
+/**
+ * destroy_tty_buffer() - destroy struct iucv_tty_buffer element.
+ * @bufp:       Pointer to a struct iucv_tty_buffer element, SHALL NOT be NULL.
+ *
+ * The destroy_tty_buffer() function frees the internal data buffer and returns
+ * the struct iucv_tty_buffer element back to the mempool for freeing.
+ */
+static void destroy_tty_buffer(struct iucv_tty_buffer *bufp)
+{
+        kfree(bufp->mbuf);
+        mempool_free(bufp, hvc_iucv_mempool);
+}
+
+/**
+ * destroy_tty_buffer_list() - call destroy_tty_buffer() for each list element.
+ * @list:       List head pointer to a list containing struct iucv_tty_buffer
+ *              elements.
+ *
+ * Calls destroy_tty_buffer() for each struct iucv_tty_buffer element in the
+ * list @list.
+ */
+static void destroy_tty_buffer_list(struct list_head *list)
+{
+        struct iucv_tty_buffer *ent, *next;
+
+        list_for_each_entry_safe(ent, next, list, list) {
+                list_del(&ent->list);
+                destroy_tty_buffer(ent);
+        }
+}
+
+/**
+ * hvc_iucv_write() - Receive IUCV message write data to HVC console buffer.
+ * @priv:               Pointer to hvc_iucv_private structure.
+ * @buf:                HVC console buffer for writing received terminal data.
+ * @count:              HVC console buffer size.
+ * @has_more_data:      Pointer to an int variable.
+ *
+ * The function picks up pending messages from the input queue and receives
+ * the message data that is then written to the specified buffer @buf.
+ * If the buffer size @count is less than the data message size, then the
+ * message is kept on the input queue and @has_more_data is set to 1.
+ * If the message data has been entirely written, the message is removed from
+ * the input queue.
+ *
+ * The function returns the number of bytes written to the terminal, zero if
+ * there are no pending data messages available or if there is no established
+ * IUCV path.
+ * If the IUCV path has been severed, then -EPIPE is returned to cause a
+ * hang up (that is issued by the HVC console layer).
+ */
+static int hvc_iucv_write(struct hvc_iucv_private *priv,
+                          char *buf, int count, int *has_more_data)
+{
+        struct iucv_tty_buffer *rb;
+        int written;
+        int rc;
+
+        /* Immediately return if there is no IUCV connection */
+        if (priv->iucv_state == IUCV_DISCONN)
+                return 0;
+
+        /* If the IUCV path has been severed, return -EPIPE to inform the
+         * hvc console layer to hang up the tty device. */
+        if (priv->iucv_state == IUCV_SEVERED)
+                return -EPIPE;
+
+        /* check if there are pending messages */
+        if (list_empty(&priv->tty_inqueue))
+                return 0;
+
+        /* receive a iucv message and flip data to the tty (ldisc) */
+        rb = list_first_entry(&priv->tty_inqueue, struct iucv_tty_buffer, list);
+
+        written = 0;
+        if (!rb->mbuf) { /* message not yet received ... */
+                /* allocate mem to store msg data; if no memory is available
+                 * then leave the buffer on the list and re-try later */
+                rb->mbuf = kmalloc(rb->msg.length, GFP_ATOMIC);
+                if (!rb->mbuf)
+                        return -ENOMEM;
+
+                rc = __iucv_message_receive(priv->path, &rb->msg, 0,
+                                            rb->mbuf, rb->msg.length, NULL);
+                switch (rc) {
+                case 0: /* Successful       */
+                        break;
+                case 2: /* No message found */
+                case 9: /* Message purged   */
+                        break;
+                default:
+                        written = -EIO;
+                }
+                /* remove buffer if an error has occured or received data
+                 * is not correct */
+                if (rc || (rb->mbuf->version != MSG_VERSION) ||
+                          (rb->msg.length    != MSG_SIZE(rb->mbuf->datalen)))
+                        goto out_remove_buffer;
+        }
+
+        switch (rb->mbuf->type) {
+        case MSG_TYPE_DATA:
+                written = min_t(int, rb->mbuf->datalen - rb->offset, count);
+                memcpy(buf, rb->mbuf->data + rb->offset, written);
+                if (written < (rb->mbuf->datalen - rb->offset)) {
+                        rb->offset += written;
+                        *has_more_data = 1;
+                        goto out_written;
+                }
+                break;
+
+        case MSG_TYPE_WINSIZE:
+                if (rb->mbuf->datalen != sizeof(struct winsize))
+                        break;
+                hvc_resize(priv->hvc, *((struct winsize *)rb->mbuf->data));
+                break;
+
+        case MSG_TYPE_ERROR:    /* ignored ... */
+        case MSG_TYPE_TERMENV:  /* ignored ... */
+        case MSG_TYPE_TERMIOS:  /* ignored ... */
+                break;
+        }
+
+out_remove_buffer:
+        list_del(&rb->list);
+        destroy_tty_buffer(rb);
+        *has_more_data = !list_empty(&priv->tty_inqueue);
+
+out_written:
+        return written;
+}
+
+/**
+ * hvc_iucv_get_chars() - HVC get_chars operation.
+ * @vtermno:    HVC virtual terminal number.
+ * @buf:        Pointer to a buffer to store data
+ * @count:      Size of buffer available for writing
+ *
+ * The hvc_console thread calls this method to read characters from
+ * the terminal backend. If an IUCV communication path has been established,
+ * pending IUCV messages are received and data is copied into buffer @buf
+ * up to @count bytes.
+ *
+ * Locking:     The routine gets called under an irqsave() spinlock; and
+ *              the routine locks the struct hvc_iucv_private->lock to call
+ *              helper functions.
+ */
+static int hvc_iucv_get_chars(uint32_t vtermno, char *buf, int count)
+{
+        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
+        int written;
+        int has_more_data;
+
+        if (count <= 0)
+                return 0;
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+        has_more_data = 0;
+        written = hvc_iucv_write(priv, buf, count, &has_more_data);
+        spin_unlock(&priv->lock);
+
+        /* if there are still messages on the queue... schedule another run */
+        if (has_more_data)
+                hvc_kick();
+
+        return written;
+}
+
+/**
+ * hvc_iucv_send() - Send an IUCV message containing terminal data.
+ * @priv:       Pointer to struct hvc_iucv_private instance.
+ * @buf:        Buffer containing data to send.
+ * @size:       Size of buffer and amount of data to send.
+ *
+ * If an IUCV communication path is established, the function copies the buffer
+ * data to a newly allocated struct iucv_tty_buffer element, sends the data and
+ * puts the element to the outqueue.
+ *
+ * If there is no IUCV communication path established, the function returns 0.
+ * If an existing IUCV communicaton path has been severed, the function returns
+ * -EPIPE (can be passed to HVC layer to cause a tty hangup).
+ */
+static int hvc_iucv_send(struct hvc_iucv_private *priv, const char *buf,
+                         int count)
+{
+        struct iucv_tty_buffer *sb;
+        int rc;
+        u16 len;
+
+        if (priv->iucv_state == IUCV_SEVERED)
+                return -EPIPE;
+
+        if (priv->iucv_state == IUCV_DISCONN)
+                return 0;
+
+        len = min_t(u16, MSG_MAX_DATALEN, count);
+
+        /* allocate internal buffer to store msg data and also compute total
+         * message length */
+        sb = alloc_tty_buffer(len, GFP_ATOMIC);
+        if (!sb)
+                return -ENOMEM;
+
+        sb->mbuf->datalen = len;
+        memcpy(sb->mbuf->data, buf, len);
+
+        list_add_tail(&sb->list, &priv->tty_outqueue);
+
+        rc = __iucv_message_send(priv->path, &sb->msg, 0, 0,
+                                 (void *) sb->mbuf, sb->msg.length);
+        if (rc) {
+                list_del(&sb->list);
+                destroy_tty_buffer(sb);
+                len = 0;
+        }
+
+        return len;
+}
+
+/**
+ * hvc_iucv_put_chars() - HVC put_chars operation.
+ * @vtermno:    HVC virtual terminal number.
+ * @buf:        Pointer to an buffer to read data from
+ * @count:      Size of buffer available for reading
+ *
+ * The hvc_console thread calls this method to write characters from
+ * to the terminal backend.
+ * The function calls hvc_iucv_send() under the lock of the
+ * struct hvc_iucv_private instance that corresponds to the tty @vtermno.
+ *
+ * Locking:     The method gets called under an irqsave() spinlock; and
+ *              locks struct hvc_iucv_private->lock.
+ */
+static int hvc_iucv_put_chars(uint32_t vtermno, const char *buf, int count)
+{
+        struct hvc_iucv_private *priv = hvc_iucv_get_private(vtermno);
+        int sent;
+
+        if (count <= 0)
+                return 0;
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+        sent = hvc_iucv_send(priv, buf, count);
+        spin_unlock(&priv->lock);
+
+        return sent;
+}
+
+/**
+ * hvc_iucv_notifier_add() - HVC notifier for opening a TTY for the first time.
+ * @hp: Pointer to the HVC device (struct hvc_struct)
+ * @id: Additional data (originally passed to hvc_alloc): the index of an struct
+ *      hvc_iucv_private instance.
+ *
+ * The function sets the tty state to TTY_OPEN for the struct hvc_iucv_private
+ * instance that is derived from @id. Always returns 0.
+ *
+ * Locking:     struct hvc_iucv_private->lock, spin_lock_bh
+ */
+static int hvc_iucv_notifier_add(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return 0;
+
+        spin_lock_bh(&priv->lock);
+        priv->tty_state = TTY_OPENED;
+        spin_unlock_bh(&priv->lock);
+
+        return 0;
+}
+
+/**
+ * hvc_iucv_cleanup() - Clean up function if the tty portion is finally closed.
+ * @priv:       Pointer to the struct hvc_iucv_private instance.
+ *
+ * The functions severs the established IUCV communication path (if any), and
+ * destroy struct iucv_tty_buffer elements from the in- and outqueue. Finally,
+ * the functions resets the states to TTY_CLOSED and IUCV_DISCONN.
+ */
+static void hvc_iucv_cleanup(struct hvc_iucv_private *priv)
+{
+        destroy_tty_buffer_list(&priv->tty_outqueue);
+        destroy_tty_buffer_list(&priv->tty_inqueue);
+
+        priv->tty_state = TTY_CLOSED;
+        priv->iucv_state = IUCV_DISCONN;
+}
+
+/**
+ * hvc_iucv_notifier_hangup() - HVC notifier for tty hangups.
+ * @hp: Pointer to the HVC device (struct hvc_struct)
+ * @id: Additional data (originally passed to hvc_alloc): the index of an struct
+ *      hvc_iucv_private instance.
+ *
+ * This routine notifies the HVC backend that a tty hangup (carrier loss,
+ * virtual or otherwise) has occured.
+ *
+ * The HVC backend for z/VM IUCV ignores virtual hangups (vhangup()), to keep
+ * an existing IUCV communication path established.
+ * (Background: vhangup() is called from user space (by getty or login) to
+ *              disable writing to the tty by other applications).
+ *
+ * If the tty has been opened (e.g. getty) and an established IUCV path has been
+ * severed (we caused the tty hangup in that case), then the functions invokes
+ * hvc_iucv_cleanup() to clean up.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_notifier_hangup(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return;
+
+        spin_lock_bh(&priv->lock);
+        /* NOTE: If the hangup was scheduled by ourself (from the iucv
+         *       path_servered callback [IUCV_SEVERED]), then we have to
+         *       finally clean up the tty backend structure and set state to
+         *       TTY_CLOSED.
+         *
+         *       If the tty was hung up otherwise (e.g. vhangup()), then we
+         *       ignore this hangup and keep an established IUCV path open...
+         *       (...the reason is that we are not able to connect back to the
+         *       client if we disconnect on hang up) */
+        priv->tty_state = TTY_CLOSED;
+
+        if (priv->iucv_state == IUCV_SEVERED)
+                hvc_iucv_cleanup(priv);
+        spin_unlock_bh(&priv->lock);
+}
+
+/**
+ * hvc_iucv_notifier_del() - HVC notifier for closing a TTY for the last time.
+ * @hp:         Pointer to the HVC device (struct hvc_struct)
+ * @id:         Additional data (originally passed to hvc_alloc):
+ *              the index of an struct hvc_iucv_private instance.
+ *
+ * This routine notifies the HVC backend that the last tty device file
+ * descriptor has been closed.
+ * The function calls hvc_iucv_cleanup() to clean up the struct hvc_iucv_private
+ * instance.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_notifier_del(struct hvc_struct *hp, int id)
+{
+        struct hvc_iucv_private *priv;
+        struct iucv_path        *path;
+
+        priv = hvc_iucv_get_private(id);
+        if (!priv)
+                return;
+
+        spin_lock_bh(&priv->lock);
+        path = priv->path;              /* save reference to IUCV path */
+        priv->path = NULL;
+        hvc_iucv_cleanup(priv);
+        spin_unlock_bh(&priv->lock);
+
+        /* sever IUCV path outside of priv->lock due to lock ordering of:
+         * priv->lock <--> iucv_table_lock */
+        if (path) {
+                iucv_path_sever(path, NULL);
+                iucv_path_free(path);
+        }
+}
+
+/**
+ * hvc_iucv_path_pending() - IUCV handler to process a connection request.
+ * @path:       Pending path (struct iucv_path)
+ * @ipvmid:     Originator z/VM system identifier
+ * @ipuser:     User specified data for this path
+ *              (AF_IUCV: port/service name and originator port)
+ *
+ * The function uses the @ipuser data to check to determine if the pending
+ * path belongs to a terminal managed by this HVC backend.
+ * If the check is successful, then an additional check is done to ensure
+ * that a terminal cannot be accessed multiple times (only one connection
+ * to a terminal is allowed). In that particular case, the pending path is
+ * severed. If it is the first connection, the pending path is accepted and
+ * associated to the struct hvc_iucv_private. The iucv state is updated to
+ * reflect that a communication path has been established.
+ *
+ * Returns 0 if the path belongs to a terminal managed by the this HVC backend;
+ * otherwise returns -ENODEV in order to dispatch this path to other handlers.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static  int hvc_iucv_path_pending(struct iucv_path *path,
+                                  u8 ipvmid[8], u8 ipuser[16])
+{
+        struct hvc_iucv_private *priv;
+        u8 nuser_data[16];
+        int i, rc;
+
+        priv = NULL;
+        for (i = 0; i < hvc_iucv_devices; i++)
+                if (hvc_iucv_table[i] &&
+                    (0 == memcmp(hvc_iucv_table[i]->srv_name, ipuser, 8))) {
+                        priv = hvc_iucv_table[i];
+                        break;
+                }
+
+        if (!priv)
+                return -ENODEV;
+
+        spin_lock(&priv->lock);
+
+        /* If the terminal is already connected or being severed, then sever
+         * this path to enforce that there is only ONE established communication
+         * path per terminal. */
+        if (priv->iucv_state != IUCV_DISCONN) {
+                iucv_path_sever(path, ipuser);
+                iucv_path_free(path);
+                goto out_path_handled;
+        }
+
+        /* accept path */
+        memcpy(nuser_data, ipuser + 8, 8);  /* remote service (for af_iucv) */
+        memcpy(nuser_data + 8, ipuser, 8);  /* local service  (for af_iucv) */
+        path->msglim = 0xffff;              /* IUCV MSGLIMIT */
+        path->flags &= ~IUCV_IPRMDATA;      /* TODO: use IUCV_IPRMDATA */
+        rc = iucv_path_accept(path, &hvc_iucv_handler, nuser_data, priv);
+        if (rc) {
+                iucv_path_sever(path, ipuser);
+                iucv_path_free(path);
+                goto out_path_handled;
+        }
+        priv->path = path;
+        priv->iucv_state = IUCV_CONNECTED;
+
+out_path_handled:
+        spin_unlock(&priv->lock);
+        return 0;
+}
+
+/**
+ * hvc_iucv_path_severed() - IUCV handler to process a path sever.
+ * @path:       Pending path (struct iucv_path)
+ * @ipuser:     User specified data for this path
+ *              (AF_IUCV: port/service name and originator port)
+ *
+ * The function also severs the path (as required by the IUCV protocol) and
+ * sets the iucv state to IUCV_SEVERED for the associated struct
+ * hvc_iucv_private instance. Later, the IUCV_SEVERED state triggers a tty
+ * hangup (hvc_iucv_get_chars() / hvc_iucv_write()).
+ *
+ * If tty portion of the HVC is closed then clean up the outqueue in addition.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_path_severed(struct iucv_path *path, u8 ipuser[16])
+{
+        struct hvc_iucv_private *priv = path->private;
+
+        spin_lock(&priv->lock);
+        priv->iucv_state = IUCV_SEVERED;
+
+        /* NOTE: If the tty has not yet been opened by a getty program
+         *       (e.g. to see console messages), then cleanup the
+         *       hvc_iucv_private structure to allow re-connects.
+         *
+         *       If the tty has been opened, the get_chars() callback returns
+         *       -EPIPE to signal the hvc console layer to hang up the tty. */
+        priv->path = NULL;
+        if (priv->tty_state == TTY_CLOSED)
+                hvc_iucv_cleanup(priv);
+        spin_unlock(&priv->lock);
+
+        /* finally sever path (outside of priv->lock due to lock ordering) */
+        iucv_path_sever(path, ipuser);
+        iucv_path_free(path);
+}
+
+/**
+ * hvc_iucv_msg_pending() - IUCV handler to process an incoming IUCV message.
+ * @path:       Pending path (struct iucv_path)
+ * @msg:        Pointer to the IUCV message
+ *
+ * The function stores an incoming message on the input queue for later
+ * processing (by hvc_iucv_get_chars() / hvc_iucv_write()).
+ * However, if the tty has not yet been opened, the message is rejected.
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_msg_pending(struct iucv_path *path,
+                                 struct iucv_message *msg)
+{
+        struct hvc_iucv_private *priv = path->private;
+        struct iucv_tty_buffer *rb;
+
+        spin_lock(&priv->lock);
+
+        /* reject messages if tty has not yet been opened */
+        if (priv->tty_state == TTY_CLOSED) {
+                iucv_message_reject(path, msg);
+                goto unlock_return;
+        }
+
+        /* allocate buffer an empty buffer element */
+        rb = alloc_tty_buffer(0, GFP_ATOMIC);
+        if (!rb) {
+                iucv_message_reject(path, msg);
+                goto unlock_return;     /* -ENOMEM */
+        }
+        rb->msg = *msg;
+
+        list_add_tail(&rb->list, &priv->tty_inqueue);
+
+        hvc_kick();     /* wakup hvc console thread */
+
+unlock_return:
+        spin_unlock(&priv->lock);
+}
+
+/**
+ * hvc_iucv_msg_complete() - IUCV handler to process message completion
+ * @path:       Pending path (struct iucv_path)
+ * @msg:        Pointer to the IUCV message
+ *
+ * The function is called upon completion of message delivery and the
+ * message is removed from the outqueue. Additional delivery information
+ * can be found in msg->audit: rejected messages (0x040000 (IPADRJCT)) and
+ * purged messages (0x010000 (IPADPGNR)).
+ *
+ * Locking:     struct hvc_iucv_private->lock
+ */
+static void hvc_iucv_msg_complete(struct iucv_path *path,
+                                  struct iucv_message *msg)
+{
+        struct hvc_iucv_private *priv = path->private;
+        struct iucv_tty_buffer  *ent, *next;
+        LIST_HEAD(list_remove);
+
+        spin_lock(&priv->lock);
+        list_for_each_entry_safe(ent, next, &priv->tty_outqueue, list)
+                if (ent->msg.id == msg->id) {
+                        list_move(&ent->list, &list_remove);
+                        break;
+                }
+        spin_unlock(&priv->lock);
+        destroy_tty_buffer_list(&list_remove);
+}
+
+
+/* HVC operations */
+static struct hv_ops hvc_iucv_ops = {
+        .get_chars = hvc_iucv_get_chars,
+        .put_chars = hvc_iucv_put_chars,
+        .notifier_add = hvc_iucv_notifier_add,
+        .notifier_del = hvc_iucv_notifier_del,
+        .notifier_hangup = hvc_iucv_notifier_hangup,
+};
+
+/**
+ * hvc_iucv_alloc() - Allocates a new struct hvc_iucv_private instance
+ * @id: hvc_iucv_table index
+ *
+ * This function allocates a new hvc_iucv_private struct and put the
+ * instance into hvc_iucv_table at index @id.
+ * Returns 0 on success; otherwise non-zero.
+ */
+static int __init hvc_iucv_alloc(int id)
+{
+        struct hvc_iucv_private *priv;
+        char name[9];
+        int rc;
+
+        priv = kzalloc(sizeof(struct hvc_iucv_private), GFP_KERNEL);
+        if (!priv)
+                return -ENOMEM;
+
+        spin_lock_init(&priv->lock);
+        INIT_LIST_HEAD(&priv->tty_outqueue);
+        INIT_LIST_HEAD(&priv->tty_inqueue);
+
+        /* Finally allocate hvc */
+        priv->hvc = hvc_alloc(HVC_IUCV_MAGIC + id,
+                              HVC_IUCV_MAGIC + id, &hvc_iucv_ops, PAGE_SIZE);
+        if (IS_ERR(priv->hvc)) {
+                rc = PTR_ERR(priv->hvc);
+                kfree(priv);
+                return rc;
+        }
+
+        /* setup iucv related information */
+        snprintf(name, 9, "ihvc%-4d", id);
+        memcpy(priv->srv_name, name, 8);
+        ASCEBC(priv->srv_name, 8);
+
+        hvc_iucv_table[id] = priv;
+        return 0;
+}
+
+/**
+ * hvc_iucv_init() - Initialization of HVC backend for z/VM IUCV
+ */
+static int __init hvc_iucv_init(void)
+{
+        int rc, i;
+
+        if (!MACHINE_IS_VM) {
+                pr_warning("The z/VM IUCV Hypervisor console cannot be "
+                           "used without z/VM.\n");
+                return -ENODEV;
+        }
+
+        if (!hvc_iucv_devices)
+                return -ENODEV;
+
+        if (hvc_iucv_devices > MAX_HVC_IUCV_LINES)
+                return -EINVAL;
+
+        hvc_iucv_buffer_cache = kmem_cache_create(KMSG_COMPONENT,
+                                           sizeof(struct iucv_tty_buffer),
+                                           0, 0, NULL);
+        if (!hvc_iucv_buffer_cache) {
+                pr_err("Not enough memory for driver initialization "
+                        "(rs=%d).\n", 1);
+                return -ENOMEM;
+        }
+
+        hvc_iucv_mempool = mempool_create_slab_pool(MEMPOOL_MIN_NR,
+                                                    hvc_iucv_buffer_cache);
+        if (!hvc_iucv_mempool) {
+                pr_err("Not enough memory for driver initialization "
+                        "(rs=%d).\n", 2);
+                kmem_cache_destroy(hvc_iucv_buffer_cache);
+                return -ENOMEM;
+        }
+
+        /* allocate hvc_iucv_private structs */
+        for (i = 0; i < hvc_iucv_devices; i++) {
+                rc = hvc_iucv_alloc(i);
+                if (rc) {
+                        pr_err("Could not create new z/VM IUCV HVC backend "
+                                "rc=%d.\n", rc);
+                        goto out_error_hvc;
+                }
+        }
+
+        /* register IUCV callback handler */
+        rc = iucv_register(&hvc_iucv_handler, 0);
+        if (rc) {
+                pr_err("Could not register iucv handler (rc=%d).\n", rc);
+                goto out_error_iucv;
+        }
+
+        return 0;
+
+out_error_iucv:
+        iucv_unregister(&hvc_iucv_handler, 0);
+out_error_hvc:
+        for (i = 0; i < hvc_iucv_devices; i++)
+                if (hvc_iucv_table[i]) {
+                        if (hvc_iucv_table[i]->hvc)
+                                hvc_remove(hvc_iucv_table[i]->hvc);
+                        kfree(hvc_iucv_table[i]);
+                }
+        mempool_destroy(hvc_iucv_mempool);
+        kmem_cache_destroy(hvc_iucv_buffer_cache);
+        return rc;
+}
+
+/**
+ * hvc_iucv_console_init() - Early console initialization
+ */
+static  int __init hvc_iucv_console_init(void)
+{
+        if (!MACHINE_IS_VM || !hvc_iucv_devices)
+                return -ENODEV;
+        return hvc_instantiate(HVC_IUCV_MAGIC, 0, &hvc_iucv_ops);
+}
+
+/**
+ * hvc_iucv_config() - Parsing of hvc_iucv=  kernel command line parameter
+ * @val:        Parameter value (numeric)
+ */
+static  int __init hvc_iucv_config(char *val)
+{
+         return strict_strtoul(val, 10, &hvc_iucv_devices);
+}
+
+
+module_init(hvc_iucv_init);
+console_initcall(hvc_iucv_console_init);
+__setup("hvc_iucv=", hvc_iucv_config);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("HVC back-end for z/VM IUCV.");
+MODULE_AUTHOR("Hendrik Brueckner <brueckner@linux.vnet.ibm.com>");
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 8054ee839b3c..88cee4099be9 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -32,9 +32,10 @@
  *              added changelog
  *      1.2     Erik Gilling: Cobalt Networks support
  *              Tim Hockin: general cleanup, Cobalt support
+ *      1.3     Wim Van Sebroeck: convert PRINT_PROC to seq_file
  */
 
-#define NVRAM_VERSION   "1.2"
+#define NVRAM_VERSION   "1.3"
 
 #include <linux/module.h>
 #include <linux/smp_lock.h>
@@ -46,7 +47,7 @@
 /* select machine configuration */
 #if defined(CONFIG_ATARI)
 #  define MACH ATARI
-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__)  /* and others?? */
+#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__)  /* and ?? */
 #  define MACH PC
 #else
 #  error Cannot build nvram driver for this machine configuration.
@@ -106,10 +107,11 @@
 #include <linux/mc146818rtc.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 
-#include <asm/io.h>
-#include <asm/uaccess.h>
 #include <asm/system.h>
 
 static DEFINE_SPINLOCK(nvram_state_lock);
@@ -122,8 +124,8 @@ static int mach_check_checksum(void);
 static void mach_set_checksum(void);
 
 #ifdef CONFIG_PROC_FS
-static int mach_proc_infos(unsigned char *contents, char *buffer, int *len,
-    off_t *begin, off_t offset, int size);
+static void mach_proc_infos(unsigned char *contents, struct seq_file *seq,
+                                                                void *offset);
 #endif
 
 /*
@@ -133,18 +135,17 @@ static int mach_proc_infos(unsigned char *contents, char *buffer, int *len,
  *
  * It is worth noting that these functions all access bytes of general
  * purpose memory in the NVRAM - that is to say, they all add the
- * NVRAM_FIRST_BYTE offset.  Pass them offsets into NVRAM as if you did not 
+ * NVRAM_FIRST_BYTE offset.  Pass them offsets into NVRAM as if you did not
  * know about the RTC cruft.
  */
 
-unsigned char
-__nvram_read_byte(int i)
+unsigned char __nvram_read_byte(int i)
 {
         return CMOS_READ(NVRAM_FIRST_BYTE + i);
 }
+EXPORT_SYMBOL(__nvram_read_byte);
 
-unsigned char
-nvram_read_byte(int i)
+unsigned char nvram_read_byte(int i)
 {
         unsigned long flags;
         unsigned char c;
@@ -154,16 +155,16 @@ nvram_read_byte(int i)
         spin_unlock_irqrestore(&rtc_lock, flags);
         return c;
 }
+EXPORT_SYMBOL(nvram_read_byte);
 
 /* This races nicely with trying to read with checksum checking (nvram_read) */
-void
-__nvram_write_byte(unsigned char c, int i)
+void __nvram_write_byte(unsigned char c, int i)
 {
         CMOS_WRITE(c, NVRAM_FIRST_BYTE + i);
 }
+EXPORT_SYMBOL(__nvram_write_byte);
 
-void
-nvram_write_byte(unsigned char c, int i)
+void nvram_write_byte(unsigned char c, int i)
 {
         unsigned long flags;
 
@@ -171,15 +172,15 @@ nvram_write_byte(unsigned char c, int i)
         __nvram_write_byte(c, i);
         spin_unlock_irqrestore(&rtc_lock, flags);
 }
+EXPORT_SYMBOL(nvram_write_byte);
 
-int
-__nvram_check_checksum(void)
+int __nvram_check_checksum(void)
 {
         return mach_check_checksum();
 }
+EXPORT_SYMBOL(__nvram_check_checksum);
 
-int
-nvram_check_checksum(void)
+int nvram_check_checksum(void)
 {
         unsigned long flags;
         int rv;
@@ -189,16 +190,15 @@ nvram_check_checksum(void)
         spin_unlock_irqrestore(&rtc_lock, flags);
         return rv;
 }
+EXPORT_SYMBOL(nvram_check_checksum);
 
-static void
-__nvram_set_checksum(void)
+static void __nvram_set_checksum(void)
 {
         mach_set_checksum();
 }
 
 #if 0
-void
-nvram_set_checksum(void)
+void nvram_set_checksum(void)
 {
         unsigned long flags;
 
@@ -212,7 +212,7 @@ nvram_set_checksum(void)
  * The are the file operation function for user access to /dev/nvram
  */
 
-static loff_t nvram_llseek(struct file *file,loff_t offset, int origin )
+static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)
 {
         lock_kernel();
         switch (origin) {
@@ -230,8 +230,8 @@ static loff_t nvram_llseek(struct file *file,loff_t offset, int origin )
         return (offset >= 0) ? (file->f_pos = offset) : -EINVAL;
 }
 
-static ssize_t
-nvram_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+static ssize_t nvram_read(struct file *file, char __user *buf,
+                                                size_t count, loff_t *ppos)
 {
         unsigned char contents[NVRAM_BYTES];
         unsigned i = *ppos;
@@ -254,13 +254,13 @@ nvram_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 
         return tmp - contents;
 
-      checksum_err:
+checksum_err:
         spin_unlock_irq(&rtc_lock);
         return -EIO;
 }
 
-static ssize_t
-nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+static ssize_t nvram_write(struct file *file, const char __user *buf,
+                                                size_t count, loff_t *ppos)
 {
         unsigned char contents[NVRAM_BYTES];
         unsigned i = *ppos;
@@ -287,14 +287,13 @@ nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppo
 
         return tmp - contents;
 
-      checksum_err:
+checksum_err:
         spin_unlock_irq(&rtc_lock);
         return -EIO;
 }
 
-static int
-nvram_ioctl(struct inode *inode, struct file *file,
-    unsigned int cmd, unsigned long arg)
+static int nvram_ioctl(struct inode *inode, struct file *file,
+                                        unsigned int cmd, unsigned long arg)
 {
         int i;
 
@@ -315,7 +314,7 @@ nvram_ioctl(struct inode *inode, struct file *file,
                 return 0;
 
         case NVRAM_SETCKS:
-                /* just set checksum, contents unchanged (maybe useful after 
+                /* just set checksum, contents unchanged (maybe useful after
                  * checksum garbaged somehow...) */
                 if (!capable(CAP_SYS_ADMIN))
                         return -EACCES;
@@ -330,8 +329,7 @@ nvram_ioctl(struct inode *inode, struct file *file,
         }
 }
 
-static int
-nvram_open(struct inode *inode, struct file *file)
+static int nvram_open(struct inode *inode, struct file *file)
 {
         lock_kernel();
         spin_lock(&nvram_state_lock);
@@ -356,8 +354,7 @@ nvram_open(struct inode *inode, struct file *file)
         return 0;
 }
 
-static int
-nvram_release(struct inode *inode, struct file *file)
+static int nvram_release(struct inode *inode, struct file *file)
 {
         spin_lock(&nvram_state_lock);
 
@@ -375,48 +372,47 @@ nvram_release(struct inode *inode, struct file *file)
 }
 
 #ifndef CONFIG_PROC_FS
-static int
-nvram_read_proc(char *buffer, char **start, off_t offset,
-    int size, int *eof, void *data)
+static int nvram_add_proc_fs(void)
 {
         return 0;
 }
+
 #else
 
-static int
-nvram_read_proc(char *buffer, char **start, off_t offset,
-    int size, int *eof, void *data)
+static int nvram_proc_read(struct seq_file *seq, void *offset)
 {
         unsigned char contents[NVRAM_BYTES];
-        int i, len = 0;
-        off_t begin = 0;
+        int i = 0;
 
         spin_lock_irq(&rtc_lock);
         for (i = 0; i < NVRAM_BYTES; ++i)
                 contents[i] = __nvram_read_byte(i);
         spin_unlock_irq(&rtc_lock);
 
-        *eof = mach_proc_infos(contents, buffer, &len, &begin, offset, size);
+        mach_proc_infos(contents, seq, offset);
 
-        if (offset >= begin + len)
-                return 0;
-        *start = buffer + (offset - begin);
-        return (size < begin + len - offset) ? size : begin + len - offset;
+        return 0;
+}
 
+static int nvram_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, nvram_proc_read, NULL);
 }
 
-/* This macro frees the machine specific function from bounds checking and
- * this like that... */
-#define PRINT_PROC(fmt,args...)                                 \
-        do {                                                    \
-                *len += sprintf(buffer+*len, fmt, ##args);      \
-                if (*begin + *len > offset + size)              \
-                        return 0;                               \
-                if (*begin + *len < offset) {                   \
-                        *begin += *len;                         \
-                        *len = 0;                               \
-                }                                               \
-        } while(0)
+static const struct file_operations nvram_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = nvram_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int nvram_add_proc_fs(void)
+{
+        if (!proc_create("driver/nvram", 0, NULL, &nvram_proc_fops))
+                return -ENOMEM;
+        return 0;
+}
 
 #endif /* CONFIG_PROC_FS */
 
@@ -436,8 +432,7 @@ static struct miscdevice nvram_dev = {
         &nvram_fops
 };
 
-static int __init
-nvram_init(void)
+static int __init nvram_init(void)
 {
         int ret;
 
@@ -451,23 +446,21 @@ nvram_init(void)
                     NVRAM_MINOR);
                 goto out;
         }
-        if (!create_proc_read_entry("driver/nvram", 0, NULL, nvram_read_proc,
-                NULL)) {
+        ret = nvram_add_proc_fs();
+        if (ret) {
                 printk(KERN_ERR "nvram: can't create /proc/driver/nvram\n");
-                ret = -ENOMEM;
                 goto outmisc;
         }
         ret = 0;
         printk(KERN_INFO "Non-volatile memory driver v" NVRAM_VERSION "\n");
-      out:
+out:
         return ret;
-      outmisc:
+outmisc:
         misc_deregister(&nvram_dev);
         goto out;
 }
 
-static void __exit
-nvram_cleanup_module(void)
+static void __exit nvram_cleanup_module(void)
 {
         remove_proc_entry("driver/nvram", NULL);
         misc_deregister(&nvram_dev);
@@ -482,8 +475,7 @@ module_exit(nvram_cleanup_module);
 
 #if MACH == PC
 
-static int
-pc_check_checksum(void)
+static int pc_check_checksum(void)
 {
         int i;
         unsigned short sum = 0;
@@ -493,11 +485,10 @@ pc_check_checksum(void)
                 sum += __nvram_read_byte(i);
         expect = __nvram_read_byte(PC_CKS_LOC)<<8 |
             __nvram_read_byte(PC_CKS_LOC+1);
-        return ((sum & 0xffff) == expect);
+        return (sum & 0xffff) == expect;
 }
 
-static void
-pc_set_checksum(void)
+static void pc_set_checksum(void)
 {
         int i;
         unsigned short sum = 0;
@@ -522,9 +513,8 @@ static char *gfx_types[] = {
         "monochrome",
 };
 
-static int
-pc_proc_infos(unsigned char *nvram, char *buffer, int *len,
-    off_t *begin, off_t offset, int size)
+static void pc_proc_infos(unsigned char *nvram, struct seq_file *seq,
+                                                                void *offset)
 {
         int checksum;
         int type;
@@ -533,56 +523,57 @@ pc_proc_infos(unsigned char *nvram, char *buffer, int *len,
         checksum = __nvram_check_checksum();
         spin_unlock_irq(&rtc_lock);
 
-        PRINT_PROC("Checksum status: %svalid\n", checksum ? "" : "not ");
+        seq_printf(seq, "Checksum status: %svalid\n", checksum ? "" : "not ");
 
-        PRINT_PROC("# floppies     : %d\n",
+        seq_printf(seq, "# floppies     : %d\n",
             (nvram[6] & 1) ? (nvram[6] >> 6) + 1 : 0);
-        PRINT_PROC("Floppy 0 type  : ");
+        seq_printf(seq, "Floppy 0 type  : ");
         type = nvram[2] >> 4;
         if (type < ARRAY_SIZE(floppy_types))
-                PRINT_PROC("%s\n", floppy_types[type]);
+                seq_printf(seq, "%s\n", floppy_types[type]);
         else
-                PRINT_PROC("%d (unknown)\n", type);
-        PRINT_PROC("Floppy 1 type  : ");
+                seq_printf(seq, "%d (unknown)\n", type);
+        seq_printf(seq, "Floppy 1 type  : ");
         type = nvram[2] & 0x0f;
         if (type < ARRAY_SIZE(floppy_types))
-                PRINT_PROC("%s\n", floppy_types[type]);
+                seq_printf(seq, "%s\n", floppy_types[type]);
         else
-                PRINT_PROC("%d (unknown)\n", type);
+                seq_printf(seq, "%d (unknown)\n", type);
 
-        PRINT_PROC("HD 0 type      : ");
+        seq_printf(seq, "HD 0 type      : ");
         type = nvram[4] >> 4;
         if (type)
-                PRINT_PROC("%02x\n", type == 0x0f ? nvram[11] : type);
+                seq_printf(seq, "%02x\n", type == 0x0f ? nvram[11] : type);
         else
-                PRINT_PROC("none\n");
+                seq_printf(seq, "none\n");
 
-        PRINT_PROC("HD 1 type      : ");
+        seq_printf(seq, "HD 1 type      : ");
         type = nvram[4] & 0x0f;
         if (type)
-                PRINT_PROC("%02x\n", type == 0x0f ? nvram[12] : type);
+                seq_printf(seq, "%02x\n", type == 0x0f ? nvram[12] : type);
         else
-                PRINT_PROC("none\n");
+                seq_printf(seq, "none\n");
 
-        PRINT_PROC("HD type 48 data: %d/%d/%d C/H/S, precomp %d, lz %d\n",
+        seq_printf(seq, "HD type 48 data: %d/%d/%d C/H/S, precomp %d, lz %d\n",
             nvram[18] | (nvram[19] << 8),
             nvram[20], nvram[25],
             nvram[21] | (nvram[22] << 8), nvram[23] | (nvram[24] << 8));
-        PRINT_PROC("HD type 49 data: %d/%d/%d C/H/S, precomp %d, lz %d\n",
+        seq_printf(seq, "HD type 49 data: %d/%d/%d C/H/S, precomp %d, lz %d\n",
             nvram[39] | (nvram[40] << 8),
             nvram[41], nvram[46],
             nvram[42] | (nvram[43] << 8), nvram[44] | (nvram[45] << 8));
 
-        PRINT_PROC("DOS base memory: %d kB\n", nvram[7] | (nvram[8] << 8));
-        PRINT_PROC("Extended memory: %d kB (configured), %d kB (tested)\n",
+        seq_printf(seq, "DOS base memory: %d kB\n", nvram[7] | (nvram[8] << 8));
+        seq_printf(seq, "Extended memory: %d kB (configured), %d kB (tested)\n",
             nvram[9] | (nvram[10] << 8), nvram[34] | (nvram[35] << 8));
 
-        PRINT_PROC("Gfx adapter    : %s\n", gfx_types[(nvram[6] >> 4) & 3]);
+        seq_printf(seq, "Gfx adapter    : %s\n",
+            gfx_types[(nvram[6] >> 4) & 3]);
 
-        PRINT_PROC("FPU            : %sinstalled\n",
+        seq_printf(seq, "FPU            : %sinstalled\n",
             (nvram[6] & 2) ? "" : "not ");
 
-        return 1;
+        return;
 }
 #endif
 
@@ -590,20 +581,18 @@ pc_proc_infos(unsigned char *nvram, char *buffer, int *len,
 
 #if MACH == ATARI
 
-static int
-atari_check_checksum(void)
+static int atari_check_checksum(void)
 {
         int i;
         unsigned char sum = 0;
 
         for (i = ATARI_CKS_RANGE_START; i <= ATARI_CKS_RANGE_END; ++i)
                 sum += __nvram_read_byte(i);
-        return (__nvram_read_byte(ATARI_CKS_LOC) == (~sum & 0xff) &&
-            __nvram_read_byte(ATARI_CKS_LOC + 1) == (sum & 0xff));
+        return (__nvram_read_byte(ATARI_CKS_LOC) == (~sum & 0xff)) &&
+            (__nvram_read_byte(ATARI_CKS_LOC + 1) == (sum & 0xff));
 }
 
-static void
-atari_set_checksum(void)
+static void atari_set_checksum(void)
 {
         int i;
         unsigned char sum = 0;
@@ -654,82 +643,75 @@ static char *colors[] = {
         "2", "4", "16", "256", "65536", "??", "??", "??"
 };
 
-static int
-atari_proc_infos(unsigned char *nvram, char *buffer, int *len,
-    off_t *begin, off_t offset, int size)
+static void atari_proc_infos(unsigned char *nvram, struct seq_file *seq,
+                                                                void *offset)
 {
         int checksum = nvram_check_checksum();
         int i;
         unsigned vmode;
 
-        PRINT_PROC("Checksum status  : %svalid\n", checksum ? "" : "not ");
+        seq_printf(seq, "Checksum status  : %svalid\n", checksum ? "" : "not ");
 
-        PRINT_PROC("Boot preference  : ");
+        seq_printf(seq, "Boot preference  : ");
         for (i = ARRAY_SIZE(boot_prefs) - 1; i >= 0; --i) {
                 if (nvram[1] == boot_prefs[i].val) {
-                        PRINT_PROC("%s\n", boot_prefs[i].name);
+                        seq_printf(seq, "%s\n", boot_prefs[i].name);
                         break;
                 }
         }
         if (i < 0)
-                PRINT_PROC("0x%02x (undefined)\n", nvram[1]);
+                seq_printf(seq, "0x%02x (undefined)\n", nvram[1]);
 
-        PRINT_PROC("SCSI arbitration : %s\n",
+        seq_printf(seq, "SCSI arbitration : %s\n",
             (nvram[16] & 0x80) ? "on" : "off");
-        PRINT_PROC("SCSI host ID     : ");
+        seq_printf(seq, "SCSI host ID     : ");
         if (nvram[16] & 0x80)
-                PRINT_PROC("%d\n", nvram[16] & 7);
+                seq_printf(seq, "%d\n", nvram[16] & 7);
         else
-                PRINT_PROC("n/a\n");
+                seq_printf(seq, "n/a\n");
 
         /* the following entries are defined only for the Falcon */
         if ((atari_mch_cookie >> 16) != ATARI_MCH_FALCON)
-                return 1;
+                return;
 
-        PRINT_PROC("OS language      : ");
+        seq_printf(seq, "OS language      : ");
         if (nvram[6] < ARRAY_SIZE(languages))
-                PRINT_PROC("%s\n", languages[nvram[6]]);
+                seq_printf(seq, "%s\n", languages[nvram[6]]);
         else
-                PRINT_PROC("%u (undefined)\n", nvram[6]);
-        PRINT_PROC("Keyboard language: ");
+                seq_printf(seq, "%u (undefined)\n", nvram[6]);
+        seq_printf(seq, "Keyboard language: ");
         if (nvram[7] < ARRAY_SIZE(languages))
-                PRINT_PROC("%s\n", languages[nvram[7]]);
+                seq_printf(seq, "%s\n", languages[nvram[7]]);
         else
-                PRINT_PROC("%u (undefined)\n", nvram[7]);
-        PRINT_PROC("Date format      : ");
-        PRINT_PROC(dateformat[nvram[8] & 7],
+                seq_printf(seq, "%u (undefined)\n", nvram[7]);
+        seq_printf(seq, "Date format      : ");
+        seq_printf(seq, dateformat[nvram[8] & 7],
             nvram[9] ? nvram[9] : '/', nvram[9] ? nvram[9] : '/');
-        PRINT_PROC(", %dh clock\n", nvram[8] & 16 ? 24 : 12);
-        PRINT_PROC("Boot delay       : ");
+        seq_printf(seq, ", %dh clock\n", nvram[8] & 16 ? 24 : 12);
+        seq_printf(seq, "Boot delay       : ");
         if (nvram[10] == 0)
-                PRINT_PROC("default");
+                seq_printf(seq, "default");
         else
-                PRINT_PROC("%ds%s\n", nvram[10],
+                seq_printf(seq, "%ds%s\n", nvram[10],
                     nvram[10] < 8 ? ", no memory test" : "");
 
         vmode = (nvram[14] << 8) || nvram[15];
-        PRINT_PROC("Video mode       : %s colors, %d columns, %s %s monitor\n",
+        seq_printf(seq,
+            "Video mode       : %s colors, %d columns, %s %s monitor\n",
             colors[vmode & 7],
             vmode & 8 ? 80 : 40,
             vmode & 16 ? "VGA" : "TV", vmode & 32 ? "PAL" : "NTSC");
-        PRINT_PROC("                   %soverscan, compat. mode %s%s\n",
+        seq_printf(seq, "                   %soverscan, compat. mode %s%s\n",
             vmode & 64 ? "" : "no ",
             vmode & 128 ? "on" : "off",
             vmode & 256 ?
             (vmode & 16 ? ", line doubling" : ", half screen") : "");
 
-        return 1;
+        return;
 }
 #endif
 
 #endif /* MACH == ATARI */
 
 MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(__nvram_read_byte);
-EXPORT_SYMBOL(nvram_read_byte);
-EXPORT_SYMBOL(__nvram_write_byte);
-EXPORT_SYMBOL(nvram_write_byte);
-EXPORT_SYMBOL(__nvram_check_checksum);
-EXPORT_SYMBOL(nvram_check_checksum);
 MODULE_ALIAS_MISCDEV(NVRAM_MINOR);
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index ce0d9da52a8a..94966edfb44d 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -274,6 +274,22 @@ static struct sysrq_key_op sysrq_showstate_blocked_op = {
         .enable_mask    = SYSRQ_ENABLE_DUMP,
 };
 
+#ifdef CONFIG_TRACING
+#include <linux/ftrace.h>
+
+static void sysrq_ftrace_dump(int key, struct tty_struct *tty)
+{
+        ftrace_dump();
+}
+static struct sysrq_key_op sysrq_ftrace_dump_op = {
+        .handler        = sysrq_ftrace_dump,
+        .help_msg       = "dumpZ-ftrace-buffer",
+        .action_msg     = "Dump ftrace buffer",
+        .enable_mask    = SYSRQ_ENABLE_DUMP,
+};
+#else
+#define sysrq_ftrace_dump_op (*(struct sysrq_key_op *)0)
+#endif
 
 static void sysrq_handle_showmem(int key, struct tty_struct *tty)
 {
@@ -406,7 +422,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
         NULL,                           /* x */
         /* y: May be registered on sparc64 for global register dump */
         NULL,                           /* y */
-        NULL                            /* z */
+        &sysrq_ftrace_dump_op,          /* z */
 };
 
 /* key2index calculation, -1 on invalid index */
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c
index 5787249934c8..34ab6d798f81 100644
--- a/drivers/char/tty_audit.c
+++ b/drivers/char/tty_audit.c
@@ -67,6 +67,29 @@ static void tty_audit_buf_put(struct tty_audit_buf *buf)
                 tty_audit_buf_free(buf);
 }
 
+static void tty_audit_log(const char *description, struct task_struct *tsk,
+                          uid_t loginuid, unsigned sessionid, int major,
+                          int minor, unsigned char *data, size_t size)
+{
+        struct audit_buffer *ab;
+
+        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
+        if (ab) {
+                char name[sizeof(tsk->comm)];
+                uid_t uid = task_uid(tsk);
+
+                audit_log_format(ab, "%s pid=%u uid=%u auid=%u ses=%u "
+                                 "major=%d minor=%d comm=", description,
+                                 tsk->pid, uid, loginuid, sessionid,
+                                 major, minor);
+                get_task_comm(name, tsk);
+                audit_log_untrustedstring(ab, name);
+                audit_log_format(ab, " data=");
+                audit_log_n_hex(ab, data, size);
+                audit_log_end(ab);
+        }
+}
+
 /**
  *      tty_audit_buf_push      -       Push buffered data out
  *
@@ -77,25 +100,12 @@ static void tty_audit_buf_push(struct task_struct *tsk, uid_t loginuid,
                                unsigned int sessionid,
                                struct tty_audit_buf *buf)
 {
-        struct audit_buffer *ab;
-
         if (buf->valid == 0)
                 return;
         if (audit_enabled == 0)
                 return;
-        ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_TTY);
-        if (ab) {
-                char name[sizeof(tsk->comm)];
-
-                audit_log_format(ab, "tty pid=%u uid=%u auid=%u ses=%u "
-                                 "major=%d minor=%d comm=", tsk->pid, tsk->uid,
-                                 loginuid, sessionid, buf->major, buf->minor);
-                get_task_comm(name, tsk);
-                audit_log_untrustedstring(ab, name);
-                audit_log_format(ab, " data=");
-                audit_log_n_hex(ab, buf->data, buf->valid);
-                audit_log_end(ab);
-        }
+        tty_audit_log("tty", tsk, loginuid, sessionid, buf->major, buf->minor,
+                      buf->data, buf->valid);
         buf->valid = 0;
 }
 
@@ -150,6 +160,42 @@ void tty_audit_fork(struct signal_struct *sig)
 }
 
 /**
+ *      tty_audit_tiocsti       -       Log TIOCSTI
+ */
+void tty_audit_tiocsti(struct tty_struct *tty, char ch)
+{
+        struct tty_audit_buf *buf;
+        int major, minor, should_audit;
+
+        spin_lock_irq(&current->sighand->siglock);
+        should_audit = current->signal->audit_tty;
+        buf = current->signal->tty_audit_buf;
+        if (buf)
+                atomic_inc(&buf->count);
+        spin_unlock_irq(&current->sighand->siglock);
+
+        major = tty->driver->major;
+        minor = tty->driver->minor_start + tty->index;
+        if (buf) {
+                mutex_lock(&buf->mutex);
+                if (buf->major == major && buf->minor == minor)
+                        tty_audit_buf_push_current(buf);
+                mutex_unlock(&buf->mutex);
+                tty_audit_buf_put(buf);
+        }
+
+        if (should_audit && audit_enabled) {
+                uid_t auid;
+                unsigned int sessionid;
+
+                auid = audit_get_loginuid(current);
+                sessionid = audit_get_sessionid(current);
+                tty_audit_log("ioctl=TIOCSTI", current, auid, sessionid, major,
+                              minor, &ch, 1);
+        }
+}
+
+/**
  *      tty_audit_push_task     -       Flush task's pending audit data
  */
 void tty_audit_push_task(struct task_struct *tsk, uid_t loginuid, u32 sessionid)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 1412a8d1e58d..db15f9ba7c0b 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2018,6 +2018,7 @@ static int tiocsti(struct tty_struct *tty, char __user *p)
                 return -EPERM;
         if (get_user(ch, p))
                 return -EFAULT;
+        tty_audit_tiocsti(tty, ch);
         ld = tty_ldisc_ref_wait(tty);
         ld->ops->receive_buf(tty, &ch, &mbz, 1);
         tty_ldisc_deref(ld);