diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2017-03-30 13:52:07 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-10 15:36:10 -0400 |
| commit | 3b5685fd65c0ab8720dfa8c8562e99463326b816 (patch) | |
| tree | 5b136ba430571236bd8fee6c10919db7526709b4 /src/usr/runtime | |
| parent | e40ab09295b5fea8d3fc250433476437bdeb0d8e (diff) | |
| download | talos-hostboot-3b5685fd65c0ab8720dfa8c8562e99463326b816.tar.gz talos-hostboot-3b5685fd65c0ab8720dfa8c8562e99463326b816.zip | |
Set HDAT ranges to match HOMER/OCC attributes
Change-Id: Idff2818997488fc6378907c9ddfb56892c2608b3
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38647
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
| -rw-r--r-- | src/usr/runtime/populate_hbruntime.C | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/usr/runtime/populate_hbruntime.C b/src/usr/runtime/populate_hbruntime.C index dba45d701..1e00379e5 100644 --- a/src/usr/runtime/populate_hbruntime.C +++ b/src/usr/runtime/populate_hbruntime.C @@ -469,10 +469,10 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) // Opal HB reserved memory data // -----TOP_OF_MEM------- - // -----HOMER_0---------- - // -----...-------------- - // -----HOMER_N---------- // -----OCC Common------- + // -----HOMER_N---------- + // -----...-------------- + // -----HOMER_0---------- // -----VPD-------------- // -----ATTR Data-------- // -----HBRT Image------- @@ -489,7 +489,8 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) for (const auto & l_procChip: l_procChips) { - l_homerAddr -= VMM_HOMER_INSTANCE_SIZE; + l_homerAddr = l_procChip->getAttr + <TARGETING::ATTR_HOMER_PHYS_ADDR>(); // Get a pointer to the next available HDAT HB Rsv Mem entry l_rngPtr = nullptr; @@ -525,8 +526,12 @@ errlHndl_t populate_HbRsvMem(uint64_t i_nodeId) #ifdef CONFIG_START_OCC_DURING_BOOT // OCC Common entry - uint64_t l_occCommonAddr = l_topMemAddr - - VMM_ALL_HOMER_OCC_MEMORY_SIZE; + TARGETING::Target * l_sys = nullptr; + TARGETING::targetService().getTopLevelTarget( l_sys ); + assert(l_sys != nullptr); + uint64_t l_occCommonAddr = l_sys->getAttr + <TARGETING::ATTR_OCC_COMMON_AREA_PHYS_ADDR>(); + l_label = "ibm,occ-common-area"; l_labelSize = strlen(l_label) + 1; |
