Bad address when start_payload executes from non-master core.

Change-Id: I913f072e8c3adda990072a226d23e8ffd82767aa
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8116
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index f2d50bae5..9b134263e 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -70,7 +70,7 @@
 #include    <runtime/runtime.H>
 #include    <devtree/devtreeif.H>
 #include    <sys/task.h>
-#include    <kernel/cpu.H> // for KERNEL_MAX_SUPPORTED_CPUS_PER_NODE
+#include    <intr/interrupt.H>
 #include    <kernel/ipc.H> // for internode data areas
 #include    <mbox/ipc_msg_types.H>
 
@@ -405,8 +405,14 @@ void*    call_host_start_payload( void    *io_pArgs )
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
             "call_host_start_payload entry" );
 
-    uint64_t this_node =
-        task_getcpuid()/KERNEL_MAX_SUPPORTED_CPUS_PER_NODE;
+    // For single-node systems, the non-master processors can be in a
+    // different logical (powerbus) node.  Need to migrate task to master.
+    task_affinity_pin();
+    task_affinity_migrate_to_master();
+
+    uint64_t this_node = INTR::PIR_t(task_getcpuid()).nodeId;
+
+    task_affinity_unpin();
 
     // broadcast shutdown to other HB instances.
     l_errl = broadcastShutdown(this_node);