diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-03-31 13:40:50 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-11 12:18:33 -0400 |
| commit | edb74f80cc2a8a0e51de869c2a77517e0184b50e (patch) | |
| tree | 1f6e835da4a87a3988c83df122bb3b33c379f65b /src/include | |
| parent | 97d6fee68a3980cbedb37d7daf30cdb338efabda (diff) | |
| download | blackbird-hostboot-edb74f80cc2a8a0e51de869c2a77517e0184b50e.tar.gz blackbird-hostboot-edb74f80cc2a8a0e51de869c2a77517e0184b50e.zip | |
Bug fixes and workarounds for Hostboot Reserved Memory
Set type to invalid (0xFF) for unallocated ranges
Silently handle both old and new HDAT formats to allow for
roll-in of other code without changes here.
Change-Id: I5558a6a3476e8d4a1b3b885eef1df1e7f74a898b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38741
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include')
| -rwxr-xr-x | src/include/usr/hdat/hdat.H | 13 | ||||
| -rw-r--r-- | src/include/usr/runtime/runtime.H | 7 | ||||
| -rw-r--r-- | src/include/usr/runtime/runtime_reasoncodes.H | 1 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/include/usr/hdat/hdat.H b/src/include/usr/hdat/hdat.H index 5c95ce792..b173dcd98 100755 --- a/src/include/usr/hdat/hdat.H +++ b/src/include/usr/hdat/hdat.H @@ -201,6 +201,19 @@ struct hdatSpira_t hdat5Tuple_t hdatDataArea[24]; }__attribute__ ((packed)); +/** @enum List of possible Range Types for Reserved Hostboot Memory (RHB) + */ +enum hdatMsVpdRhbAddrRangeType +{ + RHB_TYPE_PRIMARY = 0, + RHB_TYPE_HBRT = 1, + RHB_TYPE_VERIFIED_LIDS = 2, + RHB_TYPE_TPM_LOG = 3, + RHB_TYPE_HOMER_OCC = 4, + + RHB_TYPE_INVALID = 0xFF +}; + /* vpd constants * Defining vpd constants */ diff --git a/src/include/usr/runtime/runtime.H b/src/include/usr/runtime/runtime.H index 7086ef55b..bdbcf20a8 100644 --- a/src/include/usr/runtime/runtime.H +++ b/src/include/usr/runtime/runtime.H @@ -116,13 +116,6 @@ errlHndl_t populate_RtDataByNode(uint64_t iNodeId); // HOMER*8/OCC_Common/VPD/ATTR/HBRT_Image/Res/Res/Res #define HB_RSV_MEM_NUM_PTRS 15 -// Range types for HB reserved memory -#define RANGE_TYPE_PRIMARY 0 -#define RANGE_TYPE_HBRT 1 -#define RANGE_TYPE_VERIFIED_LIDS 2 -#define RANGE_TYPE_TPM_LOG 3 -#define RANGE_TYPE_HOMER_OCC 4 - //Note this means the Reserved Mem sub-section is the 6th //(0 based) of the MDT section (See HDAT spec) #define MDT_RESERVED_HB_MEM_SECTION 5 diff --git a/src/include/usr/runtime/runtime_reasoncodes.H b/src/include/usr/runtime/runtime_reasoncodes.H index 2678c28a0..f287a5d97 100644 --- a/src/include/usr/runtime/runtime_reasoncodes.H +++ b/src/include/usr/runtime/runtime_reasoncodes.H @@ -88,6 +88,7 @@ namespace RUNTIME RC_PM_RT_UNKNOWN_MODE = RUNTIME_COMP_ID | 0x1D, RC_PM_RT_INTERFACE_ERR = RUNTIME_COMP_ID | 0x1E, RC_PM_RT_HCODE_UPDATE_ERR = RUNTIME_COMP_ID | 0x1F, + RC_INVALID_RHB_INSTANCE = RUNTIME_COMP_ID | 0x20, }; enum UserDetailsTypes |
