2 files changed, 32 insertions, 10 deletions

diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index d551f09ccb79..6956f7e7d439 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -439,18 +439,23 @@ xpc_discovery(void)
          * nodes that can comprise an access protection grouping. The access
          * protection is in regards to memory, IOI and IPI.
          */
-        max_regions = 64;
         region_size = xp_region_size;
 
-        switch (region_size) {
-        case 128:
-                max_regions *= 2;
-        case 64:
-                max_regions *= 2;
-        case 32:
-                max_regions *= 2;
-                region_size = 16;
-                DBUG_ON(!is_shub2());
+        if (is_uv())
+                max_regions = 256;
+        else {
+                max_regions = 64;
+
+                switch (region_size) {
+                case 128:
+                        max_regions *= 2;
+                case 64:
+                        max_regions *= 2;
+                case 32:
+                        max_regions *= 2;
+                        region_size = 16;
+                        DBUG_ON(!is_shub2());
+                }
         }
 
         for (region = 0; region < max_regions; region++) {
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 1f59ee2226ca..17bbacb1b4b1 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -417,6 +417,7 @@ xpc_process_activate_IRQ_rcvd_uv(void)
 static void
 xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
                               struct xpc_activate_mq_msghdr_uv *msg_hdr,
+                              int part_setup,
                               int *wakeup_hb_checker)
 {
         unsigned long irq_flags;
@@ -481,6 +482,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
         case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV: {
                 struct xpc_activate_mq_msg_chctl_closerequest_uv *msg;
 
+                if (!part_setup)
+                        break;
+
                 msg = container_of(msg_hdr, struct
                                    xpc_activate_mq_msg_chctl_closerequest_uv,
                                    hdr);
@@ -497,6 +501,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
         case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV: {
                 struct xpc_activate_mq_msg_chctl_closereply_uv *msg;
 
+                if (!part_setup)
+                        break;
+
                 msg = container_of(msg_hdr, struct
                                    xpc_activate_mq_msg_chctl_closereply_uv,
                                    hdr);
@@ -511,6 +518,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
         case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV: {
                 struct xpc_activate_mq_msg_chctl_openrequest_uv *msg;
 
+                if (!part_setup)
+                        break;
+
                 msg = container_of(msg_hdr, struct
                                    xpc_activate_mq_msg_chctl_openrequest_uv,
                                    hdr);
@@ -528,6 +538,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
         case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV: {
                 struct xpc_activate_mq_msg_chctl_openreply_uv *msg;
 
+                if (!part_setup)
+                        break;
+
                 msg = container_of(msg_hdr, struct
                                    xpc_activate_mq_msg_chctl_openreply_uv, hdr);
                 args = &part->remote_openclose_args[msg->ch_number];
@@ -545,6 +558,9 @@ xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
         case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENCOMPLETE_UV: {
                 struct xpc_activate_mq_msg_chctl_opencomplete_uv *msg;
 
+                if (!part_setup)
+                        break;
+
                 msg = container_of(msg_hdr, struct
                                 xpc_activate_mq_msg_chctl_opencomplete_uv, hdr);
                 spin_lock_irqsave(&part->chctl_lock, irq_flags);
@@ -621,6 +637,7 @@ xpc_handle_activate_IRQ_uv(int irq, void *dev_id)
 
                         part_referenced = xpc_part_ref(part);
                         xpc_handle_activate_mq_msg_uv(part, msg_hdr,
+                                                      part_referenced,
                                                       &wakeup_hb_checker);
                         if (part_referenced)
                                 xpc_part_deref(part);