diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/isteps/istep16/call_host_ipl_complete.C | 21 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 15 | ||||
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/target_types.xml | 2 |
3 files changed, 31 insertions, 7 deletions
diff --git a/src/usr/isteps/istep16/call_host_ipl_complete.C b/src/usr/isteps/istep16/call_host_ipl_complete.C index 9c25e00a5..30857d73c 100644 --- a/src/usr/isteps/istep16/call_host_ipl_complete.C +++ b/src/usr/isteps/istep16/call_host_ipl_complete.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -70,27 +70,34 @@ void* call_host_ipl_complete (void *io_pArgs) TARGETING::targetService().getTopLevelTarget( sys ); assert(sys != NULL); - // Set number of pointer pairs for HDAT + + // Set number of pointer pairs for HDAT HB RESERVED MEM //@TODO RTC:142908 Support multiple nodes in HBRT const uint32_t NUM_NODES = 1; - uint32_t l_numSections = NUM_NODES * HBRT_NUM_PTRS; - sys->setAttr<ATTR_HDAT_HBRT_NUM_SECTIONS>(l_numSections); + uint32_t l_numRsvMemSections = NUM_NODES * HB_RSV_MEM_NUM_PTRS; + sys->setAttr<ATTR_HDAT_RSV_MEM_NUM_SECTIONS>(l_numRsvMemSections); + + + // Set number of pointer pairs for HDAT HBRT + //@TODO RTC:142908 Support multiple nodes in HBRT + uint32_t l_numHbrtSections = NUM_NODES * HBRT_NUM_PTRS; + sys->setAttr<ATTR_HDAT_HBRT_NUM_SECTIONS>(l_numHbrtSections); uint64_t l_maxSecSize = VMM_RT_VPD_SIZE; - // Set max size of a section for HDAT + // Set max size of a HBRT section for HDAT TARGETING::ATTR_HDAT_HBRT_SECTION_SIZE_type l_secSize = {0}; uint64_t *l_p_secSize = reinterpret_cast<uint64_t *>(&l_secSize); uint32_t l_attrArraySize = sizeof(ATTR_HDAT_HBRT_SECTION_SIZE_type) / sizeof(l_secSize[0]); - assert(l_numSections <= l_attrArraySize); + assert(l_numHbrtSections <= l_attrArraySize); uint64_t l_attrSize = AttrRP::maxSize(); l_maxSecSize = (l_attrSize > l_maxSecSize) ? l_attrSize : l_maxSecSize; - for (uint32_t l_sect=0; (l_sect < l_numSections); l_sect++) + for (uint32_t l_sect=0; (l_sect < l_numHbrtSections); l_sect++) { l_p_secSize[l_sect] = l_maxSecSize; } diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index feeb16384..e052f8848 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -18939,6 +18939,21 @@ Measured in GB</description> <attribute> + <id>HDAT_RSV_MEM_NUM_SECTIONS</id> + <description> + Number of internal data pointers we have in + the hostboot reserved memory section. + </description> + <simpleType> + <uint32_t> + </uint32_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <writeable/> +</attribute> + +<attribute> <id>HDAT_HBRT_NUM_SECTIONS</id> <description> Number of internal data pointers we have in diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index a696e5672..833597df8 100755 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -739,6 +739,7 @@ <attribute><id>PROC_FABRIC_CAPI_MODE</id></attribute> <attribute><id>PROC_FABRIC_ADDR_BAR_MODE</id></attribute> <!-- HDAT Hostboot Runtime Data Info --> + <attribute><id>HDAT_RSV_MEM_NUM_SECTIONS</id></attribute> <attribute><id>HDAT_HBRT_NUM_SECTIONS</id></attribute> <attribute><id>HDAT_HBRT_SECTION_SIZE</id></attribute> <attribute><id>PIB_I2C_REFCLOCK</id></attribute> @@ -937,6 +938,7 @@ <attribute><id>MSS_VOLT_DDR4_VDDR_SLOPE_EFF_CONFIG</id></attribute> <attribute><id>MSS_VOLT_DDR4_VDDR_INTERCEPT_EFF_CONFIG</id></attribute> <attribute><id>MRW_DDR4_VDDR_MAX_LIMIT_EFF_CONFIG</id></attribute> + <attribute><id>HDAT_RSV_MEM_NUM_SECTIONS</id></attribute> <attribute><id>HDAT_HBRT_NUM_SECTIONS</id></attribute> <attribute><id>HDAT_HBRT_SECTION_SIZE</id></attribute> <attribute><id>VPD_REC_NUM</id></attribute> |
