]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/iucv/iucv.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[linux-2.6-omap-h63xx.git] / net / iucv / iucv.c
index d7b54b5bfa69954778a7eed398d23e06fa18633c..032f61e985951bc85e1825a1e42529e660406713 100644 (file)
@@ -30,6 +30,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define KMSG_COMPONENT "iucv"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
@@ -424,8 +427,8 @@ static void iucv_declare_cpu(void *data)
                        err = "Paging or storage error";
                        break;
                }
-               printk(KERN_WARNING "iucv_register: iucv_declare_buffer "
-                      "on cpu %i returned error 0x%02x (%s)\n", cpu, rc, err);
+               pr_warning("Defining an interrupt buffer on CPU %i"
+                          " failed with 0x%02x (%s)\n", cpu, rc, err);
                return;
        }
 
@@ -514,6 +517,7 @@ static int iucv_enable(void)
        size_t alloc_size;
        int cpu, rc;
 
+       get_online_cpus();
        rc = -ENOMEM;
        alloc_size = iucv_max_pathid * sizeof(struct iucv_path);
        iucv_path_table = kzalloc(alloc_size, GFP_KERNEL);
@@ -521,19 +525,17 @@ static int iucv_enable(void)
                goto out;
        /* Declare per cpu buffers. */
        rc = -EIO;
-       get_online_cpus();
        for_each_online_cpu(cpu)
                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
        if (cpus_empty(iucv_buffer_cpumask))
                /* No cpu could declare an iucv buffer. */
-               goto out_path;
+               goto out;
        put_online_cpus();
        return 0;
-
-out_path:
-       put_online_cpus();
-       kfree(iucv_path_table);
 out:
+       kfree(iucv_path_table);
+       iucv_path_table = NULL;
+       put_online_cpus();
        return rc;
 }
 
@@ -548,8 +550,9 @@ static void iucv_disable(void)
 {
        get_online_cpus();
        on_each_cpu(iucv_retrieve_cpu, NULL, 1);
-       put_online_cpus();
        kfree(iucv_path_table);
+       iucv_path_table = NULL;
+       put_online_cpus();
 }
 
 static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
@@ -586,10 +589,14 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
        case CPU_ONLINE_FROZEN:
        case CPU_DOWN_FAILED:
        case CPU_DOWN_FAILED_FROZEN:
+               if (!iucv_path_table)
+                       break;
                smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
                break;
        case CPU_DOWN_PREPARE:
        case CPU_DOWN_PREPARE_FROZEN:
+               if (!iucv_path_table)
+                       break;
                cpumask = iucv_buffer_cpumask;
                cpu_clear(cpu, cpumask);
                if (cpus_empty(cpumask))
@@ -957,7 +964,52 @@ int iucv_message_purge(struct iucv_path *path, struct iucv_message *msg,
 EXPORT_SYMBOL(iucv_message_purge);
 
 /**
- * iucv_message_receive
+ * iucv_message_receive_iprmdata
+ * @path: address of iucv path structure
+ * @msg: address of iucv msg structure
+ * @flags: how the message is received (IUCV_IPBUFLST)
+ * @buffer: address of data buffer or address of struct iucv_array
+ * @size: length of data buffer
+ * @residual:
+ *
+ * Internal function used by iucv_message_receive and __iucv_message_receive
+ * to receive RMDATA data stored in struct iucv_message.
+ */
+static int iucv_message_receive_iprmdata(struct iucv_path *path,
+                                        struct iucv_message *msg,
+                                        u8 flags, void *buffer,
+                                        size_t size, size_t *residual)
+{
+       struct iucv_array *array;
+       u8 *rmmsg;
+       size_t copy;
+
+       /*
+        * Message is 8 bytes long and has been stored to the
+        * message descriptor itself.
+        */
+       if (residual)
+               *residual = abs(size - 8);
+       rmmsg = msg->rmmsg;
+       if (flags & IUCV_IPBUFLST) {
+               /* Copy to struct iucv_array. */
+               size = (size < 8) ? size : 8;
+               for (array = buffer; size > 0; array++) {
+                       copy = min_t(size_t, size, array->length);
+                       memcpy((u8 *)(addr_t) array->address,
+                               rmmsg, copy);
+                       rmmsg += copy;
+                       size -= copy;
+               }
+       } else {
+               /* Copy to direct buffer. */
+               memcpy(buffer, rmmsg, min_t(size_t, size, 8));
+       }
+       return 0;
+}
+
+/**
+ * __iucv_message_receive
  * @path: address of iucv path structure
  * @msg: address of iucv msg structure
  * @flags: how the message is received (IUCV_IPBUFLST)
@@ -969,44 +1021,19 @@ EXPORT_SYMBOL(iucv_message_purge);
  * established paths. This function will deal with RMDATA messages
  * embedded in struct iucv_message as well.
  *
+ * Locking:    no locking
+ *
  * Returns the result from the CP IUCV call.
  */
-int iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
-                        u8 flags, void *buffer, size_t size, size_t *residual)
+int __iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
+                          u8 flags, void *buffer, size_t size, size_t *residual)
 {
        union iucv_param *parm;
-       struct iucv_array *array;
-       u8 *rmmsg;
-       size_t copy;
        int rc;
 
-       if (msg->flags & IUCV_IPRMDATA) {
-               /*
-                * Message is 8 bytes long and has been stored to the
-                * message descriptor itself.
-                */
-               rc = (size < 8) ? 5 : 0;
-               if (residual)
-                       *residual = abs(size - 8);
-               rmmsg = msg->rmmsg;
-               if (flags & IUCV_IPBUFLST) {
-                       /* Copy to struct iucv_array. */
-                       size = (size < 8) ? size : 8;
-                       for (array = buffer; size > 0; array++) {
-                               copy = min_t(size_t, size, array->length);
-                               memcpy((u8 *)(addr_t) array->address,
-                                      rmmsg, copy);
-                               rmmsg += copy;
-                               size -= copy;
-                       }
-               } else {
-                       /* Copy to direct buffer. */
-                       memcpy(buffer, rmmsg, min_t(size_t, size, 8));
-               }
-               return 0;
-       }
-
-       local_bh_disable();
+       if (msg->flags & IUCV_IPRMDATA)
+               return iucv_message_receive_iprmdata(path, msg, flags,
+                                                    buffer, size, residual);
        parm = iucv_param[smp_processor_id()];
        memset(parm, 0, sizeof(union iucv_param));
        parm->db.ipbfadr1 = (u32)(addr_t) buffer;
@@ -1022,6 +1049,37 @@ int iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
                if (residual)
                        *residual = parm->db.ipbfln1f;
        }
+       return rc;
+}
+EXPORT_SYMBOL(__iucv_message_receive);
+
+/**
+ * iucv_message_receive
+ * @path: address of iucv path structure
+ * @msg: address of iucv msg structure
+ * @flags: how the message is received (IUCV_IPBUFLST)
+ * @buffer: address of data buffer or address of struct iucv_array
+ * @size: length of data buffer
+ * @residual:
+ *
+ * This function receives messages that are being sent to you over
+ * established paths. This function will deal with RMDATA messages
+ * embedded in struct iucv_message as well.
+ *
+ * Locking:    local_bh_enable/local_bh_disable
+ *
+ * Returns the result from the CP IUCV call.
+ */
+int iucv_message_receive(struct iucv_path *path, struct iucv_message *msg,
+                        u8 flags, void *buffer, size_t size, size_t *residual)
+{
+       int rc;
+
+       if (msg->flags & IUCV_IPRMDATA)
+               return iucv_message_receive_iprmdata(path, msg, flags,
+                                                    buffer, size, residual);
+       local_bh_disable();
+       rc = __iucv_message_receive(path, msg, flags, buffer, size, residual);
        local_bh_enable();
        return rc;
 }
@@ -1101,7 +1159,7 @@ int iucv_message_reply(struct iucv_path *path, struct iucv_message *msg,
 EXPORT_SYMBOL(iucv_message_reply);
 
 /**
- * iucv_message_send
+ * __iucv_message_send
  * @path: address of iucv path structure
  * @msg: address of iucv msg structure
  * @flags: how the message is sent (IUCV_IPRMDATA, IUCV_IPPRTY, IUCV_IPBUFLST)
@@ -1113,15 +1171,16 @@ EXPORT_SYMBOL(iucv_message_reply);
  * transmitted is in a buffer and this is a one-way message and the
  * receiver will not reply to the message.
  *
+ * Locking:    no locking
+ *
  * Returns the result from the CP IUCV call.
  */
-int iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
+int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
                      u8 flags, u32 srccls, void *buffer, size_t size)
 {
        union iucv_param *parm;
        int rc;
 
-       local_bh_disable();
        parm = iucv_param[smp_processor_id()];
        memset(parm, 0, sizeof(union iucv_param));
        if (flags & IUCV_IPRMDATA) {
@@ -1144,6 +1203,34 @@ int iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
        rc = iucv_call_b2f0(IUCV_SEND, parm);
        if (!rc)
                msg->id = parm->db.ipmsgid;
+       return rc;
+}
+EXPORT_SYMBOL(__iucv_message_send);
+
+/**
+ * iucv_message_send
+ * @path: address of iucv path structure
+ * @msg: address of iucv msg structure
+ * @flags: how the message is sent (IUCV_IPRMDATA, IUCV_IPPRTY, IUCV_IPBUFLST)
+ * @srccls: source class of message
+ * @buffer: address of send buffer or address of struct iucv_array
+ * @size: length of send buffer
+ *
+ * This function transmits data to another application. Data to be
+ * transmitted is in a buffer and this is a one-way message and the
+ * receiver will not reply to the message.
+ *
+ * Locking:    local_bh_enable/local_bh_disable
+ *
+ * Returns the result from the CP IUCV call.
+ */
+int iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
+                     u8 flags, u32 srccls, void *buffer, size_t size)
+{
+       int rc;
+
+       local_bh_disable();
+       rc = __iucv_message_send(path, msg, flags, srccls, buffer, size);
        local_bh_enable();
        return rc;
 }
@@ -1572,7 +1659,7 @@ static void iucv_external_interrupt(u16 code)
        BUG_ON(p->iptype  < 0x01 || p->iptype > 0x09);
        work = kmalloc(sizeof(struct iucv_irq_list), GFP_ATOMIC);
        if (!work) {
-               printk(KERN_WARNING "iucv_external_interrupt: out of memory\n");
+               pr_warning("iucv_external_interrupt: out of memory\n");
                return;
        }
        memcpy(&work->data, p, sizeof(work->data));