diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2015-07-14 09:58:35 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-08-06 16:14:19 -0500 |
| commit | 77fb3e2cb457a1fdd2ea08abf495b54278070af0 (patch) | |
| tree | 36548e642894040444a06bc42882d996122cd549 /src/usr/targeting | |
| parent | 5a39b44b4148f1a8740074dc0937b56ed162e24d (diff) | |
| download | blackbird-hostboot-77fb3e2cb457a1fdd2ea08abf495b54278070af0.tar.gz blackbird-hostboot-77fb3e2cb457a1fdd2ea08abf495b54278070af0.zip | |
Support multiple instances for reserved memory
Update HBRT interface to add an instance to get_resvered_mem and update
devtree entries with instance.
Change-Id: Ie0c5a76ce5ff347354bc91898e1c4dc032430e13
RTC: 131056
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19281
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Reviewed-by: MATTHEW A. PLOETZ <maploetz@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types_hb.xml | 14 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types_hb.xml | 1 | ||||
| -rw-r--r-- | src/usr/targeting/runtime/attrrp_rt.C | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml index 8d38f69bc..361d4d3c6 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types_hb.xml @@ -379,6 +379,20 @@ </attribute> <attribute> + <id>OCC_COMMON_AREA_PHYS_ADDR</id> + <description> + Physical address where OCC Common Area is placed in mainstore. + </description> + <simpleType> + <uint64_t></uint64_t> + </simpleType> + <persistency>volatile-zeroed</persistency> + <readable/> + <writeable/> + <hbOnly/> +</attribute> + +<attribute> <id>HOMER_PHYS_ADDR</id> <description> Physical address where HOMER image is placed in mainstore. diff --git a/src/usr/targeting/common/xmltohb/target_types_hb.xml b/src/usr/targeting/common/xmltohb/target_types_hb.xml index 8115572d6..e26a257ce 100644 --- a/src/usr/targeting/common/xmltohb/target_types_hb.xml +++ b/src/usr/targeting/common/xmltohb/target_types_hb.xml @@ -75,6 +75,7 @@ <attribute><id>HTMGT_SAFEMODE</id></attribute> <attribute><id>IPMI_SENSORS</id></attribute> <attribute><id>IPMI_MAX_BUFFER_SIZE</id></attribute> + <attribute><id>OCC_COMMON_AREA_PHYS_ADDR</id> </attribute> </targetTypeExtension> <targetTypeExtension> diff --git a/src/usr/targeting/runtime/attrrp_rt.C b/src/usr/targeting/runtime/attrrp_rt.C index 8c49837ac..dde880cc0 100644 --- a/src/usr/targeting/runtime/attrrp_rt.C +++ b/src/usr/targeting/runtime/attrrp_rt.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ namespace TARGETING do { TargetingHeader* l_header = reinterpret_cast<TargetingHeader*>( - g_hostInterfaces->get_reserved_mem("ibm,hbrt-target-image")); + g_hostInterfaces->get_reserved_mem("ibm,hbrt-target-image",0)); if ((NULL == l_header) || (l_header->eyeCatcher != PNOR_TARG_EYE_CATCHER)) |
