5 files changed, 33 insertions, 25 deletions

diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
index a5bd658c2e83..275b78896a73 100644
--- a/drivers/misc/sgi-xp/xpc.h
+++ b/drivers/misc/sgi-xp/xpc.h
@@ -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.
  */
 
 /*
@@ -514,7 +514,8 @@ struct xpc_channel_uv {
                                                 /* partition's notify mq */
 
         struct xpc_send_msg_slot_uv *send_msg_slots;
-        struct xpc_notify_mq_msg_uv *recv_msg_slots;
+        void *recv_msg_slots;   /* each slot will hold a xpc_notify_mq_msg_uv */
+                                /* structure plus the user's payload */
 
         struct xpc_fifo_head_uv msg_slot_free_list;
         struct xpc_fifo_head_uv recv_msg_list;  /* deliverable payloads */
diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index 9cd2ebe2a3b6..45fd653dbe31 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -49,9 +49,6 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
 
                 if (ch->flags & (XPC_C_CONNECTED | XPC_C_DISCONNECTING))
                         return;
-
-                DBUG_ON(ch->local_msgqueue == NULL);
-                DBUG_ON(ch->remote_msgqueue == NULL);
         }
 
         if (!(ch->flags & XPC_C_OPENREPLY)) {
diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
index 82fb9958f22f..2e975762c32b 100644
--- a/drivers/misc/sgi-xp/xpc_sn2.c
+++ b/drivers/misc/sgi-xp/xpc_sn2.c
@@ -1106,8 +1106,6 @@ xpc_process_activate_IRQ_rcvd_sn2(void)
         int n_IRQs_expected;
         int n_IRQs_detected;
 
-        DBUG_ON(xpc_activate_IRQ_rcvd == 0);
-
         spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
         n_IRQs_expected = xpc_activate_IRQ_rcvd;
         xpc_activate_IRQ_rcvd = 0;
@@ -1726,6 +1724,7 @@ xpc_clear_local_msgqueue_flags_sn2(struct xpc_channel *ch)
                 msg = (struct xpc_msg_sn2 *)((u64)ch_sn2->local_msgqueue +
                                              (get % ch->local_nentries) *
                                              ch->entry_size);
+                DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
                 msg->flags = 0;
         } while (++get < ch_sn2->remote_GP.get);
 }
@@ -1740,11 +1739,18 @@ xpc_clear_remote_msgqueue_flags_sn2(struct xpc_channel *ch)
         struct xpc_msg_sn2 *msg;
         s64 put;
 
-        put = ch_sn2->w_remote_GP.put;
+        /* flags are zeroed when the buffer is allocated */
+        if (ch_sn2->remote_GP.put < ch->remote_nentries)
+                return;
+
+        put = max(ch_sn2->w_remote_GP.put, ch->remote_nentries);
         do {
                 msg = (struct xpc_msg_sn2 *)((u64)ch_sn2->remote_msgqueue +
                                              (put % ch->remote_nentries) *
                                              ch->entry_size);
+                DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
+                DBUG_ON(!(msg->flags & XPC_M_SN2_DONE));
+                DBUG_ON(msg->number != put - ch->remote_nentries);
                 msg->flags = 0;
         } while (++put < ch_sn2->remote_GP.put);
 }
@@ -1836,6 +1842,7 @@ xpc_process_msg_chctl_flags_sn2(struct xpc_partition *part, int ch_number)
                  */
                 xpc_clear_remote_msgqueue_flags_sn2(ch);
 
+                smp_wmb(); /* ensure flags have been cleared before bte_copy */
                 ch_sn2->w_remote_GP.put = ch_sn2->remote_GP.put;
 
                 dev_dbg(xpc_chan, "w_remote_GP.put changed to %ld, partid=%d, "
@@ -1934,7 +1941,7 @@ xpc_get_deliverable_payload_sn2(struct xpc_channel *ch)
                         break;
 
                 get = ch_sn2->w_local_GP.get;
-                rmb();  /* guarantee that .get loads before .put */
+                smp_rmb();      /* guarantee that .get loads before .put */
                 if (get == ch_sn2->w_remote_GP.put)
                         break;
 
@@ -1956,11 +1963,13 @@ xpc_get_deliverable_payload_sn2(struct xpc_channel *ch)
 
                         msg = xpc_pull_remote_msg_sn2(ch, get);
 
-                        DBUG_ON(msg != NULL && msg->number != get);
-                        DBUG_ON(msg != NULL && (msg->flags & XPC_M_SN2_DONE));
-                        DBUG_ON(msg != NULL && !(msg->flags & XPC_M_SN2_READY));
+                        if (msg != NULL) {
+                                DBUG_ON(msg->number != get);
+                                DBUG_ON(msg->flags & XPC_M_SN2_DONE);
+                                DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
 
-                        payload = &msg->payload;
+                                payload = &msg->payload;
+                        }
                         break;
                 }
 
@@ -2053,7 +2062,7 @@ xpc_allocate_msg_sn2(struct xpc_channel *ch, u32 flags,
         while (1) {
 
                 put = ch_sn2->w_local_GP.put;
-                rmb();  /* guarantee that .put loads before .get */
+                smp_rmb();      /* guarantee that .put loads before .get */
                 if (put - ch_sn2->w_remote_GP.get < ch->local_nentries) {
 
                         /* There are available message entries. We need to try
@@ -2186,7 +2195,7 @@ xpc_send_payload_sn2(struct xpc_channel *ch, u32 flags, void *payload,
          * The preceding store of msg->flags must occur before the following
          * load of local_GP->put.
          */
-        mb();
+        smp_mb();
 
         /* see if the message is next in line to be sent, if so send it */
 
@@ -2277,8 +2286,9 @@ xpc_received_payload_sn2(struct xpc_channel *ch, void *payload)
         dev_dbg(xpc_chan, "msg=0x%p, msg_number=%ld, partid=%d, channel=%d\n",
                 (void *)msg, msg_number, ch->partid, ch->number);
 
-        DBUG_ON((((u64)msg - (u64)ch->remote_msgqueue) / ch->entry_size) !=
+        DBUG_ON((((u64)msg - (u64)ch->sn.sn2.remote_msgqueue) / ch->entry_size) !=
                 msg_number % ch->remote_nentries);
+        DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
         DBUG_ON(msg->flags & XPC_M_SN2_DONE);
 
         msg->flags |= XPC_M_SN2_DONE;
@@ -2287,7 +2297,7 @@ xpc_received_payload_sn2(struct xpc_channel *ch, void *payload)
          * The preceding store of msg->flags must occur before the following
          * load of local_GP->get.
          */
-        mb();
+        smp_mb();
 
         /*
          * See if this message is next in line to be acknowledged as having
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 91a55b1b1037..29c0502a96b2 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (c) 2008 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (c) 2008-2009 Silicon Graphics, Inc.  All Rights Reserved.
  */
 
 /*
@@ -1010,8 +1010,8 @@ xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)
                         continue;
 
                 for (entry = 0; entry < nentries; entry++) {
-                        msg_slot = ch_uv->recv_msg_slots + entry *
-                            ch->entry_size;
+                        msg_slot = ch_uv->recv_msg_slots +
+                            entry * ch->entry_size;
 
                         msg_slot->hdr.msg_slot_number = entry;
                 }
@@ -1308,9 +1308,8 @@ xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
         /* we're dealing with a normal message sent via the notify_mq */
         ch_uv = &ch->sn.uv;
 
-        msg_slot = (struct xpc_notify_mq_msg_uv *)((u64)ch_uv->recv_msg_slots +
-                    (msg->hdr.msg_slot_number % ch->remote_nentries) *
-                    ch->entry_size);
+        msg_slot = ch_uv->recv_msg_slots +
+            (msg->hdr.msg_slot_number % ch->remote_nentries) * ch->entry_size;
 
         BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
         BUG_ON(msg_slot->hdr.size != 0);
@@ -1423,7 +1422,7 @@ xpc_send_payload_uv(struct xpc_channel *ch, u32 flags, void *payload,
                 atomic_inc(&ch->n_to_notify);
 
                 msg_slot->key = key;
-                wmb(); /* a non-NULL func must hit memory after the key */
+                smp_wmb(); /* a non-NULL func must hit memory after the key */
                 msg_slot->func = func;
 
                 if (ch->flags & XPC_C_DISCONNECTING) {
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index 7957f525b2f4..6faefcffcb53 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999-2009 Silicon Graphics, Inc. All rights reserved.
  */
 
 /*
@@ -551,6 +551,7 @@ xpnet_init(void)
 
         netif_carrier_off(xpnet_device);
 
+        xpnet_device->netdev_ops = &xpnet_netdev_ops;
         xpnet_device->mtu = XPNET_DEF_MTU;
 
         /*