diff options
| author | Doug Gilbert <dgilbert@us.ibm.com> | 2013-06-26 16:21:46 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-07-10 16:32:50 -0500 |
| commit | 3c058d5aeb1e1fea9b002067255cd825628bf529 (patch) | |
| tree | e2e4d105a2a8c6ee285bf8f091c4b96b58977b34 /src/usr/xscom/xscom.C | |
| parent | b649b6d8ad62262517b7e0da90fbfd81283f4764 (diff) | |
| download | blackbird-hostboot-3c058d5aeb1e1fea9b002067255cd825628bf529.tar.gz blackbird-hostboot-3c058d5aeb1e1fea9b002067255cd825628bf529.zip | |
Fixes for multi-node hostboot - xscom and stand alone simics
Change-Id: Ibde8e90959ee82d3c4f1dfac2ee90ca150a7087d
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5225
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/xscom/xscom.C')
| -rw-r--r-- | src/usr/xscom/xscom.C | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/usr/xscom/xscom.C b/src/usr/xscom/xscom.C index b677e11bc..d47992ac8 100644 --- a/src/usr/xscom/xscom.C +++ b/src/usr/xscom/xscom.C @@ -68,6 +68,7 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD, TARGETING::TYPE_PROC, xscomPerformOp); +uint64_t* getCpuIdVirtualAddress(); /** * @brief Internal routine that reset XSCOM status bits * of HMER register before an XSCOM operation @@ -305,10 +306,7 @@ errlHndl_t getTargetVirtualAddress(TARGETING::Target* i_target, if (__sync_bool_compare_and_swap(&g_masterProcVirtAddr, NULL, NULL)) { - l_XSComBaseAddr = MASTER_PROC_XSCOM_BASE_ADDR; - uint64_t* l_tempVirtAddr = static_cast<uint64_t*> - (mmio_dev_map(reinterpret_cast<void*>(l_XSComBaseAddr), - THIRTYTWO_GB)); + uint64_t* l_tempVirtAddr = getCpuIdVirtualAddress(); if (!__sync_bool_compare_and_swap(&g_masterProcVirtAddr, NULL, l_tempVirtAddr)) { |
