1 files changed, 79 insertions, 59 deletions

diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index 99a2534c38a..652593fc486 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2004-2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2004-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -39,34 +39,38 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         if (!(ch->flags & XPC_C_SETUP)) {
                 spin_unlock_irqrestore(&ch->lock, *irq_flags);
-                ret = xpc_setup_msg_structures(ch);
+                ret = xpc_arch_ops.setup_msg_structures(ch);
                 spin_lock_irqsave(&ch->lock, *irq_flags);
 
                 if (ret != xpSuccess)
                         XPC_DISCONNECT_CHANNEL(ch, ret, irq_flags);
+                else
+                        ch->flags |= XPC_C_SETUP;
 
-                ch->flags |= XPC_C_SETUP;
-
-                if (ch->flags & (XPC_C_CONNECTED | XPC_C_DISCONNECTING))
+                if (ch->flags & XPC_C_DISCONNECTING)
                         return;
         }
 
         if (!(ch->flags & XPC_C_OPENREPLY)) {
                 ch->flags |= XPC_C_OPENREPLY;
-                xpc_send_chctl_openreply(ch, irq_flags);
+                xpc_arch_ops.send_chctl_openreply(ch, irq_flags);
         }
 
         if (!(ch->flags & XPC_C_ROPENREPLY))
                 return;
 
-        ch->flags = (XPC_C_CONNECTED | XPC_C_SETUP);    /* clear all else */
+        if (!(ch->flags & XPC_C_OPENCOMPLETE)) {
+                ch->flags |= (XPC_C_OPENCOMPLETE | XPC_C_CONNECTED);
+                xpc_arch_ops.send_chctl_opencomplete(ch, irq_flags);
+        }
+
+        if (!(ch->flags & XPC_C_ROPENCOMPLETE))
+                return;
 
         dev_info(xpc_chan, "channel %d to partition %d connected\n",
                  ch->number, ch->partid);
 
-        spin_unlock_irqrestore(&ch->lock, *irq_flags);
-        xpc_create_kthreads(ch, 1, 0);
-        spin_lock_irqsave(&ch->lock, *irq_flags);
+        ch->flags = (XPC_C_CONNECTED | XPC_C_SETUP);    /* clear all else */
 }
 
 /*
@@ -96,7 +100,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         if (part->act_state == XPC_P_AS_DEACTIVATING) {
                 /* can't proceed until the other side disengages from us */
-                if (xpc_partition_engaged(ch->partid))
+                if (xpc_arch_ops.partition_engaged(ch->partid))
                         return;
 
         } else {
@@ -108,7 +112,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
                 if (!(ch->flags & XPC_C_CLOSEREPLY)) {
                         ch->flags |= XPC_C_CLOSEREPLY;
-                        xpc_send_chctl_closereply(ch, irq_flags);
+                        xpc_arch_ops.send_chctl_closereply(ch, irq_flags);
                 }
 
                 if (!(ch->flags & XPC_C_RCLOSEREPLY))
@@ -118,7 +122,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
         /* wake those waiting for notify completion */
         if (atomic_read(&ch->n_to_notify) > 0) {
                 /* we do callout while holding ch->lock, callout can't block */
-                xpc_notify_senders_of_disconnect(ch);
+                xpc_arch_ops.notify_senders_of_disconnect(ch);
         }
 
         /* both sides are disconnected now */
@@ -132,7 +136,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
         DBUG_ON(atomic_read(&ch->n_to_notify) != 0);
 
         /* it's now safe to free the channel's message queues */
-        xpc_teardown_msg_structures(ch);
+        xpc_arch_ops.teardown_msg_structures(ch);
 
         ch->func = NULL;
         ch->key = NULL;
@@ -144,8 +148,9 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
 
         /*
          * Mark the channel disconnected and clear all other flags, including
-         * XPC_C_SETUP (because of call to xpc_teardown_msg_structures()) but
-         * not including XPC_C_WDISCONNECT (if it was set).
+         * XPC_C_SETUP (because of call to
+         * xpc_arch_ops.teardown_msg_structures()) but not including
+         * XPC_C_WDISCONNECT (if it was set).
          */
         ch->flags = (XPC_C_DISCONNECTED | (ch->flags & XPC_C_WDISCONNECT));
 
@@ -184,6 +189,7 @@ xpc_process_openclose_chctl_flags(struct xpc_partition *part, int ch_number,
         struct xpc_channel *ch = &part->channels[ch_number];
         enum xp_retval reason;
         enum xp_retval ret;
+        int create_kthread = 0;
 
         spin_lock_irqsave(&ch->lock, irq_flags);
 
@@ -196,8 +202,7 @@ again:
                  * has had a chance to see that the channel is disconnected.
                  */
                 ch->delayed_chctl_flags |= chctl_flags;
-                spin_unlock_irqrestore(&ch->lock, irq_flags);
-                return;
+                goto out;
         }
 
         if (chctl_flags & XPC_CHCTL_CLOSEREQUEST) {
@@ -239,8 +244,7 @@ again:
                                             XPC_CHCTL_CLOSEREQUEST;
                                         spin_unlock(&part->chctl_lock);
                                 }
-                                spin_unlock_irqrestore(&ch->lock, irq_flags);
-                                return;
+                                goto out;
                         }
 
                         XPC_SET_REASON(ch, 0, 0);
@@ -250,7 +254,8 @@ again:
                         ch->flags |= (XPC_C_CONNECTING | XPC_C_ROPENREQUEST);
                 }
 
-                chctl_flags &= ~(XPC_CHCTL_OPENREQUEST | XPC_CHCTL_OPENREPLY);
+                chctl_flags &= ~(XPC_CHCTL_OPENREQUEST | XPC_CHCTL_OPENREPLY |
+                    XPC_CHCTL_OPENCOMPLETE);
 
                 /*
                  * The meaningful CLOSEREQUEST connection state fields are:
@@ -269,8 +274,7 @@ again:
                         XPC_DISCONNECT_CHANNEL(ch, reason, &irq_flags);
 
                         DBUG_ON(chctl_flags & XPC_CHCTL_CLOSEREPLY);
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 xpc_process_disconnect(ch, &irq_flags);
@@ -283,8 +287,7 @@ again:
 
                 if (ch->flags & XPC_C_DISCONNECTED) {
                         DBUG_ON(part->act_state != XPC_P_AS_DEACTIVATING);
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 DBUG_ON(!(ch->flags & XPC_C_CLOSEREQUEST));
@@ -299,8 +302,7 @@ again:
                                     XPC_CHCTL_CLOSEREPLY;
                                 spin_unlock(&part->chctl_lock);
                         }
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 ch->flags |= XPC_C_RCLOSEREPLY;
@@ -320,14 +322,12 @@ again:
 
                 if (part->act_state == XPC_P_AS_DEACTIVATING ||
                     (ch->flags & XPC_C_ROPENREQUEST)) {
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_WDISCONNECT)) {
                         ch->delayed_chctl_flags |= XPC_CHCTL_OPENREQUEST;
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
                 DBUG_ON(!(ch->flags & (XPC_C_DISCONNECTED |
                                        XPC_C_OPENREQUEST)));
@@ -341,8 +341,7 @@ again:
                  */
                 if (args->entry_size == 0 || args->local_nentries == 0) {
                         /* assume OPENREQUEST was delayed by mistake */
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 ch->flags |= (XPC_C_ROPENREQUEST | XPC_C_CONNECTING);
@@ -352,8 +351,7 @@ again:
                         if (args->entry_size != ch->entry_size) {
                                 XPC_DISCONNECT_CHANNEL(ch, xpUnequalMsgSizes,
                                                        &irq_flags);
-                                spin_unlock_irqrestore(&ch->lock, irq_flags);
-                                return;
+                                goto out;
                         }
                 } else {
                         ch->entry_size = args->entry_size;
@@ -375,15 +373,13 @@ again:
                         args->local_msgqueue_pa, args->local_nentries,
                         args->remote_nentries, ch->partid, ch->number);
 
-                if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED)) {
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
-                }
+                if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED))
+                        goto out;
+
                 if (!(ch->flags & XPC_C_OPENREQUEST)) {
                         XPC_DISCONNECT_CHANNEL(ch, xpOpenCloseError,
                                                &irq_flags);
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
 
                 DBUG_ON(!(ch->flags & XPC_C_ROPENREQUEST));
@@ -400,11 +396,11 @@ again:
                 DBUG_ON(args->local_nentries == 0);
                 DBUG_ON(args->remote_nentries == 0);
 
-                ret = xpc_save_remote_msgqueue_pa(ch, args->local_msgqueue_pa);
+                ret = xpc_arch_ops.save_remote_msgqueue_pa(ch,
+                                                      args->local_msgqueue_pa);
                 if (ret != xpSuccess) {
                         XPC_DISCONNECT_CHANNEL(ch, ret, &irq_flags);
-                        spin_unlock_irqrestore(&ch->lock, irq_flags);
-                        return;
+                        goto out;
                 }
                 ch->flags |= XPC_C_ROPENREPLY;
 
@@ -430,7 +426,36 @@ again:
                 xpc_process_connect(ch, &irq_flags);
         }
 
+        if (chctl_flags & XPC_CHCTL_OPENCOMPLETE) {
+
+                dev_dbg(xpc_chan, "XPC_CHCTL_OPENCOMPLETE received from "
+                        "partid=%d, channel=%d\n", ch->partid, ch->number);
+
+                if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED))
+                        goto out;
+
+                if (!(ch->flags & XPC_C_OPENREQUEST) ||
+                    !(ch->flags & XPC_C_OPENREPLY)) {
+                        XPC_DISCONNECT_CHANNEL(ch, xpOpenCloseError,
+                                               &irq_flags);
+                        goto out;
+                }
+
+                DBUG_ON(!(ch->flags & XPC_C_ROPENREQUEST));
+                DBUG_ON(!(ch->flags & XPC_C_ROPENREPLY));
+                DBUG_ON(!(ch->flags & XPC_C_CONNECTED));
+
+                ch->flags |= XPC_C_ROPENCOMPLETE;
+
+                xpc_process_connect(ch, &irq_flags);
+                create_kthread = 1;
+        }
+
+out:
         spin_unlock_irqrestore(&ch->lock, irq_flags);
+
+        if (create_kthread)
+                xpc_create_kthreads(ch, 1, 0);
 }
 
 /*
@@ -508,7 +533,7 @@ xpc_connect_channel(struct xpc_channel *ch)
         /* initiate the connection */
 
         ch->flags |= (XPC_C_OPENREQUEST | XPC_C_CONNECTING);
-        xpc_send_chctl_openrequest(ch, &irq_flags);
+        xpc_arch_ops.send_chctl_openrequest(ch, &irq_flags);
 
         xpc_process_connect(ch, &irq_flags);
 
@@ -526,7 +551,7 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
         int ch_number;
         u32 ch_flags;
 
-        chctl.all_flags = xpc_get_chctl_all_flags(part);
+        chctl.all_flags = xpc_arch_ops.get_chctl_all_flags(part);
 
         /*
          * Initiate channel connections for registered channels.
@@ -564,10 +589,6 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
                         if (!(ch_flags & XPC_C_OPENREQUEST)) {
                                 DBUG_ON(ch_flags & XPC_C_SETUP);
                                 (void)xpc_connect_channel(ch);
-                        } else {
-                                spin_lock_irqsave(&ch->lock, irq_flags);
-                                xpc_process_connect(ch, &irq_flags);
-                                spin_unlock_irqrestore(&ch->lock, irq_flags);
                         }
                         continue;
                 }
@@ -579,7 +600,7 @@ xpc_process_sent_chctl_flags(struct xpc_partition *part)
                  */
 
                 if (chctl.flags[ch_number] & XPC_MSG_CHCTL_FLAGS)
-                        xpc_process_msg_chctl_flags(part, ch_number);
+                        xpc_arch_ops.process_msg_chctl_flags(part, ch_number);
         }
 }
 
@@ -755,7 +776,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
                        XPC_C_ROPENREQUEST | XPC_C_ROPENREPLY |
                        XPC_C_CONNECTING | XPC_C_CONNECTED);
 
-        xpc_send_chctl_closerequest(ch, irq_flags);
+        xpc_arch_ops.send_chctl_closerequest(ch, irq_flags);
 
         if (channel_was_connected)
                 ch->flags |= XPC_C_WASCONNECTED;
@@ -862,8 +883,8 @@ xpc_initiate_send(short partid, int ch_number, u32 flags, void *payload,
         DBUG_ON(payload == NULL);
 
         if (xpc_part_ref(part)) {
-                ret = xpc_send_payload(&part->channels[ch_number], flags,
-                                       payload, payload_size, 0, NULL, NULL);
+                ret = xpc_arch_ops.send_payload(&part->channels[ch_number],
+                                  flags, payload, payload_size, 0, NULL, NULL);
                 xpc_part_deref(part);
         }
 
@@ -914,9 +935,8 @@ xpc_initiate_send_notify(short partid, int ch_number, u32 flags, void *payload,
         DBUG_ON(func == NULL);
 
         if (xpc_part_ref(part)) {
-                ret = xpc_send_payload(&part->channels[ch_number], flags,
-                                       payload, payload_size, XPC_N_CALL, func,
-                                       key);
+                ret = xpc_arch_ops.send_payload(&part->channels[ch_number],
+                          flags, payload, payload_size, XPC_N_CALL, func, key);
                 xpc_part_deref(part);
         }
         return ret;
@@ -930,7 +950,7 @@ xpc_deliver_payload(struct xpc_channel *ch)
 {
         void *payload;
 
-        payload = xpc_get_deliverable_payload(ch);
+        payload = xpc_arch_ops.get_deliverable_payload(ch);
         if (payload != NULL) {
 
                 /*
@@ -984,7 +1004,7 @@ xpc_initiate_received(short partid, int ch_number, void *payload)
         DBUG_ON(ch_number < 0 || ch_number >= part->nchannels);
 
         ch = &part->channels[ch_number];
-        xpc_received_payload(ch, payload);
+        xpc_arch_ops.received_payload(ch, payload);
 
         /* the call to xpc_msgqueue_ref() was done by xpc_deliver_payload()  */
         xpc_msgqueue_deref(ch);