Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git] / drivers / misc / sgi-xp / xpc_uv.c
index 689cb5c68ccf94fe46785f7e4bbb5e34dd25ac81..1ac694c01623b99419e3b7d2afb9a2c16d8ceda7 100644 (file)
@@ -66,8 +66,11 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpuid, unsigned int irq,
        mq_order = get_order(mq_size);
        page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
                                mq_order);
-       if (page == NULL)
+       if (page == NULL) {
+               dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "
+                       "bytes of memory on nid=%d for GRU mq\n", mq_size, nid);
                return NULL;
+       }
 
        mq = page_address(page);
        ret = gru_create_message_queue(mq, mq_size);
@@ -193,202 +196,226 @@ xpc_process_activate_IRQ_rcvd_uv(void)
 
 }
 
-static irqreturn_t
-xpc_handle_activate_IRQ_uv(int irq, void *dev_id)
+static void
+xpc_handle_activate_mq_msg_uv(struct xpc_partition *part,
+                             struct xpc_activate_mq_msghdr_uv *msg_hdr,
+                             int *wakeup_hb_checker)
 {
        unsigned long irq_flags;
-       struct xpc_activate_mq_msghdr_uv *msg_hdr;
-       short partid;
-       struct xpc_partition *part;
-       struct xpc_partition_uv *part_uv;
+       struct xpc_partition_uv *part_uv = &part->sn.uv;
        struct xpc_openclose_args *args;
-       int wakeup_hb_checker = 0;
 
-       while ((msg_hdr = gru_get_next_message(xpc_activate_mq_uv)) != NULL) {
+       part_uv->remote_act_state = msg_hdr->act_state;
 
-               partid = msg_hdr->partid;
-               if (partid < 0 || partid >= XP_MAX_NPARTITIONS_UV) {
-                       dev_err(xpc_part, "xpc_handle_activate_IRQ_uv() invalid"
-                               "partid=0x%x passed in message\n", partid);
-                       gru_free_message(xpc_activate_mq_uv, msg_hdr);
-                       continue;
-               }
-               part = &xpc_partitions[partid];
-               part_uv = &part->sn.uv;
+       switch (msg_hdr->type) {
+       case XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV:
+               /* syncing of remote_act_state was just done above */
+               break;
 
-               part_uv->remote_act_state = msg_hdr->act_state;
+       case XPC_ACTIVATE_MQ_MSG_INC_HEARTBEAT_UV: {
+               struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
 
-               switch (msg_hdr->type) {
-               case XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV:
-                       /* syncing of remote_act_state was just done above */
-                       break;
+               msg = container_of(msg_hdr,
+                                  struct xpc_activate_mq_msg_heartbeat_req_uv,
+                                  hdr);
+               part_uv->heartbeat = msg->heartbeat;
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV: {
+               struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
+
+               msg = container_of(msg_hdr,
+                                  struct xpc_activate_mq_msg_heartbeat_req_uv,
+                                  hdr);
+               part_uv->heartbeat = msg->heartbeat;
+
+               spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
+               part_uv->flags |= XPC_P_HEARTBEAT_OFFLINE_UV;
+               spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_ONLINE_HEARTBEAT_UV: {
+               struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
+
+               msg = container_of(msg_hdr,
+                                  struct xpc_activate_mq_msg_heartbeat_req_uv,
+                                  hdr);
+               part_uv->heartbeat = msg->heartbeat;
+
+               spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
+               part_uv->flags &= ~XPC_P_HEARTBEAT_OFFLINE_UV;
+               spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_ACTIVATE_REQ_UV: {
+               struct xpc_activate_mq_msg_activate_req_uv *msg;
 
-               case XPC_ACTIVATE_MQ_MSG_INC_HEARTBEAT_UV: {
-                       struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
+               /*
+                * ??? Do we deal here with ts_jiffies being different
+                * ??? if act_state != XPC_P_AS_INACTIVE instead of
+                * ??? below?
+                */
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_activate_req_uv, hdr);
 
-                       msg = (struct xpc_activate_mq_msg_heartbeat_req_uv *)
-                           msg_hdr;
-                       part_uv->heartbeat = msg->heartbeat;
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_OFFLINE_HEARTBEAT_UV: {
-                       struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
-
-                       msg = (struct xpc_activate_mq_msg_heartbeat_req_uv *)
-                           msg_hdr;
-                       part_uv->heartbeat = msg->heartbeat;
-                       spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
-                       part_uv->flags |= XPC_P_HEARTBEAT_OFFLINE_UV;
-                       spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_ONLINE_HEARTBEAT_UV: {
-                       struct xpc_activate_mq_msg_heartbeat_req_uv *msg;
-
-                       msg = (struct xpc_activate_mq_msg_heartbeat_req_uv *)
-                           msg_hdr;
-                       part_uv->heartbeat = msg->heartbeat;
-                       spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
-                       part_uv->flags &= ~XPC_P_HEARTBEAT_OFFLINE_UV;
-                       spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_ACTIVATE_REQ_UV: {
-                       struct xpc_activate_mq_msg_activate_req_uv *msg;
-
-                       /*
-                        * ??? Do we deal here with ts_jiffies being different
-                        * ??? if act_state != XPC_P_AS_INACTIVE instead of
-                        * ??? below?
-                        */
-                       msg = (struct xpc_activate_mq_msg_activate_req_uv *)
-                           msg_hdr;
-                       spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock,
-                                         irq_flags);
-                       if (part_uv->act_state_req == 0)
-                               xpc_activate_IRQ_rcvd++;
-                       part_uv->act_state_req = XPC_P_ASR_ACTIVATE_UV;
-                       part->remote_rp_pa = msg->rp_gpa; /* !!! _pa is _gpa */
-                       part->remote_rp_ts_jiffies = msg_hdr->rp_ts_jiffies;
-                       part_uv->remote_activate_mq_gpa = msg->activate_mq_gpa;
-                       spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock,
-                                              irq_flags);
-                       wakeup_hb_checker++;
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_DEACTIVATE_REQ_UV: {
-                       struct xpc_activate_mq_msg_deactivate_req_uv *msg;
-
-                       msg = (struct xpc_activate_mq_msg_deactivate_req_uv *)
-                           msg_hdr;
-                       spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock,
-                                         irq_flags);
-                       if (part_uv->act_state_req == 0)
-                               xpc_activate_IRQ_rcvd++;
-                       part_uv->act_state_req = XPC_P_ASR_DEACTIVATE_UV;
-                       part_uv->reason = msg->reason;
-                       spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock,
-                                              irq_flags);
-                       wakeup_hb_checker++;
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV: {
-                       struct xpc_activate_mq_msg_chctl_closerequest_uv *msg;
+               spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+               if (part_uv->act_state_req == 0)
+                       xpc_activate_IRQ_rcvd++;
+               part_uv->act_state_req = XPC_P_ASR_ACTIVATE_UV;
+               part->remote_rp_pa = msg->rp_gpa; /* !!! _pa is _gpa */
+               part->remote_rp_ts_jiffies = msg_hdr->rp_ts_jiffies;
+               part_uv->remote_activate_mq_gpa = msg->activate_mq_gpa;
+               spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock, irq_flags);
 
-                       msg = (struct xpc_activate_mq_msg_chctl_closerequest_uv
-                           *)msg_hdr;
-                       args = &part->remote_openclose_args[msg->ch_number];
-                       args->reason = msg->reason;
+               (*wakeup_hb_checker)++;
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_DEACTIVATE_REQ_UV: {
+               struct xpc_activate_mq_msg_deactivate_req_uv *msg;
 
-                       spin_lock_irqsave(&part->chctl_lock, irq_flags);
-                       part->chctl.flags[msg->ch_number] |=
-                           XPC_CHCTL_CLOSEREQUEST;
-                       spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_deactivate_req_uv, hdr);
 
-                       xpc_wakeup_channel_mgr(part);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV: {
-                       struct xpc_activate_mq_msg_chctl_closereply_uv *msg;
+               spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+               if (part_uv->act_state_req == 0)
+                       xpc_activate_IRQ_rcvd++;
+               part_uv->act_state_req = XPC_P_ASR_DEACTIVATE_UV;
+               part_uv->reason = msg->reason;
+               spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+
+               (*wakeup_hb_checker)++;
+               return;
+       }
+       case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREQUEST_UV: {
+               struct xpc_activate_mq_msg_chctl_closerequest_uv *msg;
 
-                       msg = (struct xpc_activate_mq_msg_chctl_closereply_uv *)
-                           msg_hdr;
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_chctl_closerequest_uv,
+                                  hdr);
+               args = &part->remote_openclose_args[msg->ch_number];
+               args->reason = msg->reason;
 
-                       spin_lock_irqsave(&part->chctl_lock, irq_flags);
-                       part->chctl.flags[msg->ch_number] |=
-                           XPC_CHCTL_CLOSEREPLY;
-                       spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+               spin_lock_irqsave(&part->chctl_lock, irq_flags);
+               part->chctl.flags[msg->ch_number] |= XPC_CHCTL_CLOSEREQUEST;
+               spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
 
-                       xpc_wakeup_channel_mgr(part);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV: {
-                       struct xpc_activate_mq_msg_chctl_openrequest_uv *msg;
+               xpc_wakeup_channel_mgr(part);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_CHCTL_CLOSEREPLY_UV: {
+               struct xpc_activate_mq_msg_chctl_closereply_uv *msg;
 
-                       msg = (struct xpc_activate_mq_msg_chctl_openrequest_uv
-                           *)msg_hdr;
-                       args = &part->remote_openclose_args[msg->ch_number];
-                       args->msg_size = msg->msg_size;
-                       args->local_nentries = msg->local_nentries;
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_chctl_closereply_uv,
+                                  hdr);
 
-                       spin_lock_irqsave(&part->chctl_lock, irq_flags);
-                       part->chctl.flags[msg->ch_number] |=
-                           XPC_CHCTL_OPENREQUEST;
-                       spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+               spin_lock_irqsave(&part->chctl_lock, irq_flags);
+               part->chctl.flags[msg->ch_number] |= XPC_CHCTL_CLOSEREPLY;
+               spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
 
-                       xpc_wakeup_channel_mgr(part);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV: {
-                       struct xpc_activate_mq_msg_chctl_openreply_uv *msg;
-
-                       msg = (struct xpc_activate_mq_msg_chctl_openreply_uv *)
-                           msg_hdr;
-                       args = &part->remote_openclose_args[msg->ch_number];
-                       args->remote_nentries = msg->remote_nentries;
-                       args->local_nentries = msg->local_nentries;
-                       args->local_msgqueue_pa = msg->local_notify_mq_gpa;
-
-                       spin_lock_irqsave(&part->chctl_lock, irq_flags);
-                       part->chctl.flags[msg->ch_number] |=
-                           XPC_CHCTL_OPENREPLY;
-                       spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
-
-                       xpc_wakeup_channel_mgr(part);
-                       break;
-               }
-               case XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV:
-                       spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
-                       part_uv->flags |= XPC_P_ENGAGED_UV;
-                       spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
-                       break;
+               xpc_wakeup_channel_mgr(part);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV: {
+               struct xpc_activate_mq_msg_chctl_openrequest_uv *msg;
+
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_chctl_openrequest_uv,
+                                  hdr);
+               args = &part->remote_openclose_args[msg->ch_number];
+               args->entry_size = msg->entry_size;
+               args->local_nentries = msg->local_nentries;
+
+               spin_lock_irqsave(&part->chctl_lock, irq_flags);
+               part->chctl.flags[msg->ch_number] |= XPC_CHCTL_OPENREQUEST;
+               spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+
+               xpc_wakeup_channel_mgr(part);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV: {
+               struct xpc_activate_mq_msg_chctl_openreply_uv *msg;
+
+               msg = container_of(msg_hdr, struct
+                                  xpc_activate_mq_msg_chctl_openreply_uv, hdr);
+               args = &part->remote_openclose_args[msg->ch_number];
+               args->remote_nentries = msg->remote_nentries;
+               args->local_nentries = msg->local_nentries;
+               args->local_msgqueue_pa = msg->local_notify_mq_gpa;
+
+               spin_lock_irqsave(&part->chctl_lock, irq_flags);
+               part->chctl.flags[msg->ch_number] |= XPC_CHCTL_OPENREPLY;
+               spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+
+               xpc_wakeup_channel_mgr(part);
+               break;
+       }
+       case XPC_ACTIVATE_MQ_MSG_MARK_ENGAGED_UV:
+               spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
+               part_uv->flags |= XPC_P_ENGAGED_UV;
+               spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
+               break;
+
+       case XPC_ACTIVATE_MQ_MSG_MARK_DISENGAGED_UV:
+               spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
+               part_uv->flags &= ~XPC_P_ENGAGED_UV;
+               spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
+               break;
+
+       default:
+               dev_err(xpc_part, "received unknown activate_mq msg type=%d "
+                       "from partition=%d\n", msg_hdr->type, XPC_PARTID(part));
+
+               /* get hb checker to deactivate from the remote partition */
+               spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+               if (part_uv->act_state_req == 0)
+                       xpc_activate_IRQ_rcvd++;
+               part_uv->act_state_req = XPC_P_ASR_DEACTIVATE_UV;
+               part_uv->reason = xpBadMsgType;
+               spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock, irq_flags);
 
-               case XPC_ACTIVATE_MQ_MSG_MARK_DISENGAGED_UV:
-                       spin_lock_irqsave(&part_uv->flags_lock, irq_flags);
-                       part_uv->flags &= ~XPC_P_ENGAGED_UV;
-                       spin_unlock_irqrestore(&part_uv->flags_lock, irq_flags);
-                       break;
+               (*wakeup_hb_checker)++;
+               return;
+       }
 
-               default:
-                       dev_err(xpc_part, "received unknown activate_mq msg "
-                               "type=%d from partition=%d\n", msg_hdr->type,
-                               partid);
-               }
+       if (msg_hdr->rp_ts_jiffies != part->remote_rp_ts_jiffies &&
+           part->remote_rp_ts_jiffies != 0) {
+               /*
+                * ??? Does what we do here need to be sensitive to
+                * ??? act_state or remote_act_state?
+                */
+               spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+               if (part_uv->act_state_req == 0)
+                       xpc_activate_IRQ_rcvd++;
+               part_uv->act_state_req = XPC_P_ASR_REACTIVATE_UV;
+               spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock, irq_flags);
 
-               if (msg_hdr->rp_ts_jiffies != part->remote_rp_ts_jiffies &&
-                   part->remote_rp_ts_jiffies != 0) {
-                       /*
-                        * ??? Does what we do here need to be sensitive to
-                        * ??? act_state or remote_act_state?
-                        */
-                       spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock,
-                                         irq_flags);
-                       if (part_uv->act_state_req == 0)
-                               xpc_activate_IRQ_rcvd++;
-                       part_uv->act_state_req = XPC_P_ASR_REACTIVATE_UV;
-                       spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock,
-                                              irq_flags);
-                       wakeup_hb_checker++;
+               (*wakeup_hb_checker)++;
+       }
+}
+
+static irqreturn_t
+xpc_handle_activate_IRQ_uv(int irq, void *dev_id)
+{
+       struct xpc_activate_mq_msghdr_uv *msg_hdr;
+       short partid;
+       struct xpc_partition *part;
+       int wakeup_hb_checker = 0;
+
+       while ((msg_hdr = gru_get_next_message(xpc_activate_mq_uv)) != NULL) {
+
+               partid = msg_hdr->partid;
+               if (partid < 0 || partid >= XP_MAX_NPARTITIONS_UV) {
+                       dev_err(xpc_part, "xpc_handle_activate_IRQ_uv() "
+                               "received invalid partid=0x%x in message\n",
+                               partid);
+               } else {
+                       part = &xpc_partitions[partid];
+                       if (xpc_part_ref(part)) {
+                               xpc_handle_activate_mq_msg_uv(part, msg_hdr,
+                                                           &wakeup_hb_checker);
+                               xpc_part_deref(part);
+                       }
                }
 
                gru_free_message(xpc_activate_mq_uv, msg_hdr);
@@ -616,14 +643,82 @@ xpc_request_partition_deactivation_uv(struct xpc_partition *part)
        }
 }
 
+static void
+xpc_cancel_partition_deactivation_request_uv(struct xpc_partition *part)
+{
+       /* nothing needs to be done */
+       return;
+}
+
+static void
+xpc_init_fifo_uv(struct xpc_fifo_head_uv *head)
+{
+       head->first = NULL;
+       head->last = NULL;
+       spin_lock_init(&head->lock);
+       head->n_entries = 0;
+}
+
+static void *
+xpc_get_fifo_entry_uv(struct xpc_fifo_head_uv *head)
+{
+       unsigned long irq_flags;
+       struct xpc_fifo_entry_uv *first;
+
+       spin_lock_irqsave(&head->lock, irq_flags);
+       first = head->first;
+       if (head->first != NULL) {
+               head->first = first->next;
+               if (head->first == NULL)
+                       head->last = NULL;
+       }
+       head->n_entries++;
+       spin_unlock_irqrestore(&head->lock, irq_flags);
+       first->next = NULL;
+       return first;
+}
+
+static void
+xpc_put_fifo_entry_uv(struct xpc_fifo_head_uv *head,
+                     struct xpc_fifo_entry_uv *last)
+{
+       unsigned long irq_flags;
+
+       last->next = NULL;
+       spin_lock_irqsave(&head->lock, irq_flags);
+       if (head->last != NULL)
+               head->last->next = last;
+       else
+               head->first = last;
+       head->last = last;
+       head->n_entries--;
+       BUG_ON(head->n_entries < 0);
+       spin_unlock_irqrestore(&head->lock, irq_flags);
+}
+
+static int
+xpc_n_of_fifo_entries_uv(struct xpc_fifo_head_uv *head)
+{
+       return head->n_entries;
+}
+
 /*
  * Setup the channel structures that are uv specific.
  */
 static enum xp_retval
 xpc_setup_ch_structures_sn_uv(struct xpc_partition *part)
 {
-       /* !!! this function needs fleshing out */
-       return xpUnsupported;
+       struct xpc_channel_uv *ch_uv;
+       int ch_number;
+
+       for (ch_number = 0; ch_number < part->nchannels; ch_number++) {
+               ch_uv = &part->channels[ch_number].sn.uv;
+
+               xpc_init_fifo_uv(&ch_uv->msg_slot_free_list);
+               xpc_init_fifo_uv(&ch_uv->recv_msg_list);
+       }
+
+       return xpSuccess;
 }
 
 /*
@@ -632,7 +727,7 @@ xpc_setup_ch_structures_sn_uv(struct xpc_partition *part)
 static void
 xpc_teardown_ch_structures_sn_uv(struct xpc_partition *part)
 {
-       /* !!! this function needs fleshing out */
+       /* nothing needs to be done */
        return;
 }
 
@@ -679,21 +774,115 @@ xpc_get_chctl_all_flags_uv(struct xpc_partition *part)
        return chctl.all_flags;
 }
 
+static enum xp_retval
+xpc_allocate_send_msg_slot_uv(struct xpc_channel *ch)
+{
+       struct xpc_channel_uv *ch_uv = &ch->sn.uv;
+       struct xpc_send_msg_slot_uv *msg_slot;
+       unsigned long irq_flags;
+       int nentries;
+       int entry;
+       size_t nbytes;
+
+       for (nentries = ch->local_nentries; nentries > 0; nentries--) {
+               nbytes = nentries * sizeof(struct xpc_send_msg_slot_uv);
+               ch_uv->send_msg_slots = kzalloc(nbytes, GFP_KERNEL);
+               if (ch_uv->send_msg_slots == NULL)
+                       continue;
+
+               for (entry = 0; entry < nentries; entry++) {
+                       msg_slot = &ch_uv->send_msg_slots[entry];
+
+                       msg_slot->msg_slot_number = entry;
+                       xpc_put_fifo_entry_uv(&ch_uv->msg_slot_free_list,
+                                             &msg_slot->next);
+               }
+
+               spin_lock_irqsave(&ch->lock, irq_flags);
+               if (nentries < ch->local_nentries)
+                       ch->local_nentries = nentries;
+               spin_unlock_irqrestore(&ch->lock, irq_flags);
+               return xpSuccess;
+       }
+
+       return xpNoMemory;
+}
+
+static enum xp_retval
+xpc_allocate_recv_msg_slot_uv(struct xpc_channel *ch)
+{
+       struct xpc_channel_uv *ch_uv = &ch->sn.uv;
+       struct xpc_notify_mq_msg_uv *msg_slot;
+       unsigned long irq_flags;
+       int nentries;
+       int entry;
+       size_t nbytes;
+
+       for (nentries = ch->remote_nentries; nentries > 0; nentries--) {
+               nbytes = nentries * ch->entry_size;
+               ch_uv->recv_msg_slots = kzalloc(nbytes, GFP_KERNEL);
+               if (ch_uv->recv_msg_slots == NULL)
+                       continue;
+
+               for (entry = 0; entry < nentries; entry++) {
+                       msg_slot = ch_uv->recv_msg_slots + entry *
+                           ch->entry_size;
+
+                       msg_slot->hdr.msg_slot_number = entry;
+               }
+
+               spin_lock_irqsave(&ch->lock, irq_flags);
+               if (nentries < ch->remote_nentries)
+                       ch->remote_nentries = nentries;
+               spin_unlock_irqrestore(&ch->lock, irq_flags);
+               return xpSuccess;
+       }
+
+       return xpNoMemory;
+}
+
+/*
+ * Allocate msg_slots associated with the channel.
+ */
 static enum xp_retval
 xpc_setup_msg_structures_uv(struct xpc_channel *ch)
 {
-       /* !!! this function needs fleshing out */
-       return xpUnsupported;
+       static enum xp_retval ret;
+       struct xpc_channel_uv *ch_uv = &ch->sn.uv;
+
+       DBUG_ON(ch->flags & XPC_C_SETUP);
+
+       ret = xpc_allocate_send_msg_slot_uv(ch);
+       if (ret == xpSuccess) {
+
+               ret = xpc_allocate_recv_msg_slot_uv(ch);
+               if (ret != xpSuccess) {
+                       kfree(ch_uv->send_msg_slots);
+                       xpc_init_fifo_uv(&ch_uv->msg_slot_free_list);
+               }
+       }
+       return ret;
 }
 
+/*
+ * Free up msg_slots and clear other stuff that were setup for the specified
+ * channel.
+ */
 static void
 xpc_teardown_msg_structures_uv(struct xpc_channel *ch)
 {
        struct xpc_channel_uv *ch_uv = &ch->sn.uv;
 
+       DBUG_ON(!spin_is_locked(&ch->lock));
+
        ch_uv->remote_notify_mq_gpa = 0;
 
-       /* !!! this function needs fleshing out */
+       if (ch->flags & XPC_C_SETUP) {
+               xpc_init_fifo_uv(&ch_uv->msg_slot_free_list);
+               kfree(ch_uv->send_msg_slots);
+               xpc_init_fifo_uv(&ch_uv->recv_msg_list);
+               kfree(ch_uv->recv_msg_slots);
+       }
 }
 
 static void
@@ -723,7 +912,7 @@ xpc_send_chctl_openrequest_uv(struct xpc_channel *ch, unsigned long *irq_flags)
        struct xpc_activate_mq_msg_chctl_openrequest_uv msg;
 
        msg.ch_number = ch->number;
-       msg.msg_size = ch->msg_size;
+       msg.entry_size = ch->entry_size;
        msg.local_nentries = ch->local_nentries;
        xpc_send_activate_IRQ_ch_uv(ch, irq_flags, &msg, sizeof(msg),
                                    XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREQUEST_UV);
@@ -742,6 +931,18 @@ xpc_send_chctl_openreply_uv(struct xpc_channel *ch, unsigned long *irq_flags)
                                    XPC_ACTIVATE_MQ_MSG_CHCTL_OPENREPLY_UV);
 }
 
+static void
+xpc_send_chctl_local_msgrequest_uv(struct xpc_partition *part, int ch_number)
+{
+       unsigned long irq_flags;
+
+       spin_lock_irqsave(&part->chctl_lock, irq_flags);
+       part->chctl.flags[ch_number] |= XPC_CHCTL_MSGREQUEST;
+       spin_unlock_irqrestore(&part->chctl_lock, irq_flags);
+
+       xpc_wakeup_channel_mgr(part);
+}
+
 static void
 xpc_save_remote_msgqueue_pa_uv(struct xpc_channel *ch,
                               unsigned long msgqueue_pa)
@@ -798,11 +999,358 @@ xpc_any_partition_engaged_uv(void)
        return 0;
 }
 
-static struct xpc_msg *
-xpc_get_deliverable_msg_uv(struct xpc_channel *ch)
+static enum xp_retval
+xpc_allocate_msg_slot_uv(struct xpc_channel *ch, u32 flags,
+                        struct xpc_send_msg_slot_uv **address_of_msg_slot)
+{
+       enum xp_retval ret;
+       struct xpc_send_msg_slot_uv *msg_slot;
+       struct xpc_fifo_entry_uv *entry;
+
+       while (1) {
+               entry = xpc_get_fifo_entry_uv(&ch->sn.uv.msg_slot_free_list);
+               if (entry != NULL)
+                       break;
+
+               if (flags & XPC_NOWAIT)
+                       return xpNoWait;
+
+               ret = xpc_allocate_msg_wait(ch);
+               if (ret != xpInterrupted && ret != xpTimeout)
+                       return ret;
+       }
+
+       msg_slot = container_of(entry, struct xpc_send_msg_slot_uv, next);
+       *address_of_msg_slot = msg_slot;
+       return xpSuccess;
+}
+
+static void
+xpc_free_msg_slot_uv(struct xpc_channel *ch,
+                    struct xpc_send_msg_slot_uv *msg_slot)
+{
+       xpc_put_fifo_entry_uv(&ch->sn.uv.msg_slot_free_list, &msg_slot->next);
+
+       /* wakeup anyone waiting for a free msg slot */
+       if (atomic_read(&ch->n_on_msg_allocate_wq) > 0)
+               wake_up(&ch->msg_allocate_wq);
+}
+
+static void
+xpc_notify_sender_uv(struct xpc_channel *ch,
+                    struct xpc_send_msg_slot_uv *msg_slot,
+                    enum xp_retval reason)
+{
+       xpc_notify_func func = msg_slot->func;
+
+       if (func != NULL && cmpxchg(&msg_slot->func, func, NULL) == func) {
+
+               atomic_dec(&ch->n_to_notify);
+
+               dev_dbg(xpc_chan, "msg_slot->func() called, msg_slot=0x%p "
+                       "msg_slot_number=%d partid=%d channel=%d\n", msg_slot,
+                       msg_slot->msg_slot_number, ch->partid, ch->number);
+
+               func(reason, ch->partid, ch->number, msg_slot->key);
+
+               dev_dbg(xpc_chan, "msg_slot->func() returned, msg_slot=0x%p "
+                       "msg_slot_number=%d partid=%d channel=%d\n", msg_slot,
+                       msg_slot->msg_slot_number, ch->partid, ch->number);
+       }
+}
+
+static void
+xpc_handle_notify_mq_ack_uv(struct xpc_channel *ch,
+                           struct xpc_notify_mq_msg_uv *msg)
+{
+       struct xpc_send_msg_slot_uv *msg_slot;
+       int entry = msg->hdr.msg_slot_number % ch->local_nentries;
+
+       msg_slot = &ch->sn.uv.send_msg_slots[entry];
+
+       BUG_ON(msg_slot->msg_slot_number != msg->hdr.msg_slot_number);
+       msg_slot->msg_slot_number += ch->local_nentries;
+
+       if (msg_slot->func != NULL)
+               xpc_notify_sender_uv(ch, msg_slot, xpMsgDelivered);
+
+       xpc_free_msg_slot_uv(ch, msg_slot);
+}
+
+static void
+xpc_handle_notify_mq_msg_uv(struct xpc_partition *part,
+                           struct xpc_notify_mq_msg_uv *msg)
+{
+       struct xpc_partition_uv *part_uv = &part->sn.uv;
+       struct xpc_channel *ch;
+       struct xpc_channel_uv *ch_uv;
+       struct xpc_notify_mq_msg_uv *msg_slot;
+       unsigned long irq_flags;
+       int ch_number = msg->hdr.ch_number;
+
+       if (unlikely(ch_number >= part->nchannels)) {
+               dev_err(xpc_part, "xpc_handle_notify_IRQ_uv() received invalid "
+                       "channel number=0x%x in message from partid=%d\n",
+                       ch_number, XPC_PARTID(part));
+
+               /* get hb checker to deactivate from the remote partition */
+               spin_lock_irqsave(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+               if (part_uv->act_state_req == 0)
+                       xpc_activate_IRQ_rcvd++;
+               part_uv->act_state_req = XPC_P_ASR_DEACTIVATE_UV;
+               part_uv->reason = xpBadChannelNumber;
+               spin_unlock_irqrestore(&xpc_activate_IRQ_rcvd_lock, irq_flags);
+
+               wake_up_interruptible(&xpc_activate_IRQ_wq);
+               return;
+       }
+
+       ch = &part->channels[ch_number];
+       xpc_msgqueue_ref(ch);
+
+       if (!(ch->flags & XPC_C_CONNECTED)) {
+               xpc_msgqueue_deref(ch);
+               return;
+       }
+
+       /* see if we're really dealing with an ACK for a previously sent msg */
+       if (msg->hdr.size == 0) {
+               xpc_handle_notify_mq_ack_uv(ch, msg);
+               xpc_msgqueue_deref(ch);
+               return;
+       }
+
+       /* 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);
+
+       BUG_ON(msg->hdr.msg_slot_number != msg_slot->hdr.msg_slot_number);
+       BUG_ON(msg_slot->hdr.size != 0);
+
+       memcpy(msg_slot, msg, msg->hdr.size);
+
+       xpc_put_fifo_entry_uv(&ch_uv->recv_msg_list, &msg_slot->hdr.u.next);
+
+       if (ch->flags & XPC_C_CONNECTEDCALLOUT_MADE) {
+               /*
+                * If there is an existing idle kthread get it to deliver
+                * the payload, otherwise we'll have to get the channel mgr
+                * for this partition to create a kthread to do the delivery.
+                */
+               if (atomic_read(&ch->kthreads_idle) > 0)
+                       wake_up_nr(&ch->idle_wq, 1);
+               else
+                       xpc_send_chctl_local_msgrequest_uv(part, ch->number);
+       }
+       xpc_msgqueue_deref(ch);
+}
+
+static irqreturn_t
+xpc_handle_notify_IRQ_uv(int irq, void *dev_id)
+{
+       struct xpc_notify_mq_msg_uv *msg;
+       short partid;
+       struct xpc_partition *part;
+
+       while ((msg = gru_get_next_message(xpc_notify_mq_uv)) != NULL) {
+
+               partid = msg->hdr.partid;
+               if (partid < 0 || partid >= XP_MAX_NPARTITIONS_UV) {
+                       dev_err(xpc_part, "xpc_handle_notify_IRQ_uv() received "
+                               "invalid partid=0x%x in message\n", partid);
+               } else {
+                       part = &xpc_partitions[partid];
+
+                       if (xpc_part_ref(part)) {
+                               xpc_handle_notify_mq_msg_uv(part, msg);
+                               xpc_part_deref(part);
+                       }
+               }
+
+               gru_free_message(xpc_notify_mq_uv, msg);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int
+xpc_n_of_deliverable_payloads_uv(struct xpc_channel *ch)
+{
+       return xpc_n_of_fifo_entries_uv(&ch->sn.uv.recv_msg_list);
+}
+
+static void
+xpc_process_msg_chctl_flags_uv(struct xpc_partition *part, int ch_number)
+{
+       struct xpc_channel *ch = &part->channels[ch_number];
+       int ndeliverable_payloads;
+
+       xpc_msgqueue_ref(ch);
+
+       ndeliverable_payloads = xpc_n_of_deliverable_payloads_uv(ch);
+
+       if (ndeliverable_payloads > 0 &&
+           (ch->flags & XPC_C_CONNECTED) &&
+           (ch->flags & XPC_C_CONNECTEDCALLOUT_MADE)) {
+
+               xpc_activate_kthreads(ch, ndeliverable_payloads);
+       }
+
+       xpc_msgqueue_deref(ch);
+}
+
+static enum xp_retval
+xpc_send_payload_uv(struct xpc_channel *ch, u32 flags, void *payload,
+                   u16 payload_size, u8 notify_type, xpc_notify_func func,
+                   void *key)
+{
+       enum xp_retval ret = xpSuccess;
+       struct xpc_send_msg_slot_uv *msg_slot = NULL;
+       struct xpc_notify_mq_msg_uv *msg;
+       u8 msg_buffer[XPC_NOTIFY_MSG_SIZE_UV];
+       size_t msg_size;
+
+       DBUG_ON(notify_type != XPC_N_CALL);
+
+       msg_size = sizeof(struct xpc_notify_mq_msghdr_uv) + payload_size;
+       if (msg_size > ch->entry_size)
+               return xpPayloadTooBig;
+
+       xpc_msgqueue_ref(ch);
+
+       if (ch->flags & XPC_C_DISCONNECTING) {
+               ret = ch->reason;
+               goto out_1;
+       }
+       if (!(ch->flags & XPC_C_CONNECTED)) {
+               ret = xpNotConnected;
+               goto out_1;
+       }
+
+       ret = xpc_allocate_msg_slot_uv(ch, flags, &msg_slot);
+       if (ret != xpSuccess)
+               goto out_1;
+
+       if (func != NULL) {
+               atomic_inc(&ch->n_to_notify);
+
+               msg_slot->key = key;
+               wmb(); /* a non-NULL func must hit memory after the key */
+               msg_slot->func = func;
+
+               if (ch->flags & XPC_C_DISCONNECTING) {
+                       ret = ch->reason;
+                       goto out_2;
+               }
+       }
+
+       msg = (struct xpc_notify_mq_msg_uv *)&msg_buffer;
+       msg->hdr.partid = xp_partition_id;
+       msg->hdr.ch_number = ch->number;
+       msg->hdr.size = msg_size;
+       msg->hdr.msg_slot_number = msg_slot->msg_slot_number;
+       memcpy(&msg->payload, payload, payload_size);
+
+       ret = xpc_send_gru_msg(ch->sn.uv.remote_notify_mq_gpa, msg, msg_size);
+       if (ret == xpSuccess)
+               goto out_1;
+
+       XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
+out_2:
+       if (func != NULL) {
+               /*
+                * Try to NULL the msg_slot's func field. If we fail, then
+                * xpc_notify_senders_of_disconnect_uv() beat us to it, in which
+                * case we need to pretend we succeeded to send the message
+                * since the user will get a callout for the disconnect error
+                * by xpc_notify_senders_of_disconnect_uv(), and to also get an
+                * error returned here will confuse them. Additionally, since
+                * in this case the channel is being disconnected we don't need
+                * to put the the msg_slot back on the free list.
+                */
+               if (cmpxchg(&msg_slot->func, func, NULL) != func) {
+                       ret = xpSuccess;
+                       goto out_1;
+               }
+
+               msg_slot->key = NULL;
+               atomic_dec(&ch->n_to_notify);
+       }
+       xpc_free_msg_slot_uv(ch, msg_slot);
+out_1:
+       xpc_msgqueue_deref(ch);
+       return ret;
+}
+
+/*
+ * Tell the callers of xpc_send_notify() that the status of their payloads
+ * is unknown because the channel is now disconnecting.
+ *
+ * We don't worry about putting these msg_slots on the free list since the
+ * msg_slots themselves are about to be kfree'd.
+ */
+static void
+xpc_notify_senders_of_disconnect_uv(struct xpc_channel *ch)
+{
+       struct xpc_send_msg_slot_uv *msg_slot;
+       int entry;
+
+       DBUG_ON(!(ch->flags & XPC_C_DISCONNECTING));
+
+       for (entry = 0; entry < ch->local_nentries; entry++) {
+
+               if (atomic_read(&ch->n_to_notify) == 0)
+                       break;
+
+               msg_slot = &ch->sn.uv.send_msg_slots[entry];
+               if (msg_slot->func != NULL)
+                       xpc_notify_sender_uv(ch, msg_slot, ch->reason);
+       }
+}
+
+/*
+ * Get the next deliverable message's payload.
+ */
+static void *
+xpc_get_deliverable_payload_uv(struct xpc_channel *ch)
+{
+       struct xpc_fifo_entry_uv *entry;
+       struct xpc_notify_mq_msg_uv *msg;
+       void *payload = NULL;
+
+       if (!(ch->flags & XPC_C_DISCONNECTING)) {
+               entry = xpc_get_fifo_entry_uv(&ch->sn.uv.recv_msg_list);
+               if (entry != NULL) {
+                       msg = container_of(entry, struct xpc_notify_mq_msg_uv,
+                                          hdr.u.next);
+                       payload = &msg->payload;
+               }
+       }
+       return payload;
+}
+
+static void
+xpc_received_payload_uv(struct xpc_channel *ch, void *payload)
 {
-       /* !!! this function needs fleshing out */
-       return NULL;
+       struct xpc_notify_mq_msg_uv *msg;
+       enum xp_retval ret;
+
+       msg = container_of(payload, struct xpc_notify_mq_msg_uv, payload);
+
+       /* return an ACK to the sender of this message */
+
+       msg->hdr.partid = xp_partition_id;
+       msg->hdr.size = 0;      /* size of zero indicates this is an ACK */
+
+       ret = xpc_send_gru_msg(ch->sn.uv.remote_notify_mq_gpa, msg,
+                              sizeof(struct xpc_notify_mq_msghdr_uv));
+       if (ret != xpSuccess)
+               XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
+
+       msg->hdr.msg_slot_number += ch->remote_nentries;
 }
 
 int
@@ -824,6 +1372,8 @@ xpc_init_uv(void)
            xpc_request_partition_reactivation_uv;
        xpc_request_partition_deactivation =
            xpc_request_partition_deactivation_uv;
+       xpc_cancel_partition_deactivation_request =
+           xpc_cancel_partition_deactivation_request_uv;
 
        xpc_setup_ch_structures_sn = xpc_setup_ch_structures_sn_uv;
        xpc_teardown_ch_structures_sn = xpc_teardown_ch_structures_sn_uv;
@@ -848,7 +1398,18 @@ xpc_init_uv(void)
        xpc_partition_engaged = xpc_partition_engaged_uv;
        xpc_any_partition_engaged = xpc_any_partition_engaged_uv;
 
-       xpc_get_deliverable_msg = xpc_get_deliverable_msg_uv;
+       xpc_n_of_deliverable_payloads = xpc_n_of_deliverable_payloads_uv;
+       xpc_process_msg_chctl_flags = xpc_process_msg_chctl_flags_uv;
+       xpc_send_payload = xpc_send_payload_uv;
+       xpc_notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv;
+       xpc_get_deliverable_payload = xpc_get_deliverable_payload_uv;
+       xpc_received_payload = xpc_received_payload_uv;
+
+       if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
+               dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
+                       XPC_MSG_HDR_MAX_SIZE);
+               return -E2BIG;
+       }
 
        /* ??? The cpuid argument's value is 0, is that what we want? */
        /* !!! The irq argument's value isn't correct. */
@@ -857,12 +1418,26 @@ xpc_init_uv(void)
        if (xpc_activate_mq_uv == NULL)
                return -ENOMEM;
 
+       /* ??? The cpuid argument's value is 0, is that what we want? */
+       /* !!! The irq argument's value isn't correct. */
+       xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0, 0,
+                                               xpc_handle_notify_IRQ_uv);
+       if (xpc_notify_mq_uv == NULL) {
+               /* !!! The irq argument's value isn't correct. */
+               xpc_destroy_gru_mq_uv(xpc_activate_mq_uv,
+                                     XPC_ACTIVATE_MQ_SIZE_UV, 0);
+               return -ENOMEM;
+       }
+
        return 0;
 }
 
 void
 xpc_exit_uv(void)
 {
+       /* !!! The irq argument's value isn't correct. */
+       xpc_destroy_gru_mq_uv(xpc_notify_mq_uv, XPC_NOTIFY_MQ_SIZE_UV, 0);
+
        /* !!! The irq argument's value isn't correct. */
        xpc_destroy_gru_mq_uv(xpc_activate_mq_uv, XPC_ACTIVATE_MQ_SIZE_UV, 0);
 }