diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2014-01-16 17:24:40 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-01-17 10:29:30 -0600 |
| commit | 44f7757327777f888cb16334a075bc31a1ef7d9f (patch) | |
| tree | ba7d452e3e7fe45d3bd07a4023716712c7f81d3b /src/usr/runtime | |
| parent | f9335347ecafd62bd2fa72b03e967f9cb7449fd1 (diff) | |
| download | blackbird-hostboot-44f7757327777f888cb16334a075bc31a1ef7d9f.tar.gz blackbird-hostboot-44f7757327777f888cb16334a075bc31a1ef7d9f.zip | |
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>
Diffstat (limited to 'src/usr/runtime')
| -rw-r--r-- | src/usr/runtime/populate_attributes.C | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/usr/runtime/populate_attributes.C b/src/usr/runtime/populate_attributes.C index 5c47730b3..428292de4 100644 --- a/src/usr/runtime/populate_attributes.C +++ b/src/usr/runtime/populate_attributes.C @@ -40,7 +40,7 @@ #include "common/hsvc_attribute_structs.H" #include <mbox/ipc_msg_types.H> #include <sys/task.h> -#include <kernel/cpu.H> // for KERNEL_MAX_SUPPORTED_CPUS_PER_NODE +#include <intr/interrupt.H> trace_desc_t *g_trac_runtime = NULL; TRAC_INIT(&g_trac_runtime, RUNTIME_COMP_NAME, KILOBYTE); @@ -688,8 +688,10 @@ errlHndl_t populate_attributes( void ) // The assertion is that the hostboot instance must be equal to // the logical node we are running on. The ideal would be to have // a function call that would return the HB instance number. - uint64_t this_node = - task_getcpuid()/KERNEL_MAX_SUPPORTED_CPUS_PER_NODE; + task_affinity_pin(); + task_affinity_migrate_to_master(); + uint64_t this_node = INTR::PIR_t(task_getcpuid()).nodeId; + task_affinity_unpin(); //loop though all possible drawers whether they exist or not @@ -723,7 +725,7 @@ errlHndl_t populate_attributes( void ) break; } } - } + } } if(errhdl == NULL) |
