diff options
Diffstat (limited to 'src/include/usr/runtime')
| -rw-r--r-- | src/include/usr/runtime/customize_attrs_for_payload.H | 6 | ||||
| -rw-r--r-- | src/include/usr/runtime/rt_targeting.H | 98 | ||||
| -rw-r--r-- | src/include/usr/runtime/runtime.H | 4 | ||||
| -rw-r--r-- | src/include/usr/runtime/runtime_reasoncodes.H | 13 |
4 files changed, 17 insertions, 104 deletions
diff --git a/src/include/usr/runtime/customize_attrs_for_payload.H b/src/include/usr/runtime/customize_attrs_for_payload.H index a5158f996..6d6928bda 100644 --- a/src/include/usr/runtime/customize_attrs_for_payload.H +++ b/src/include/usr/runtime/customize_attrs_for_payload.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2020 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,7 +33,7 @@ */ #include <errl/errlentry.H> -#include <runtime/rt_targeting.H> +#include <targeting/runtime/rt_targeting.H> #include <targeting/common/attributes.H> namespace RUNTIME @@ -42,7 +42,7 @@ namespace RUNTIME static const TARGETING::ATTR_HBRT_HYP_ID_type HBRT_HYP_ID_UNKNOWN = 0xFFFFFFFFFFFFFFFFULL; -static const RT_TARG::rtChipId_t RT_TYPE_UNKNOWN +static const TARGETING::rtChipId_t RT_TYPE_UNKNOWN = 0xFFFFFFFFFFFFFFFFULL; /** diff --git a/src/include/usr/runtime/rt_targeting.H b/src/include/usr/runtime/rt_targeting.H deleted file mode 100644 index 9070dbc88..000000000 --- a/src/include/usr/runtime/rt_targeting.H +++ /dev/null @@ -1,98 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/include/usr/runtime/rt_targeting.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2014,2018 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ -#ifndef __RT_TARGETING_H -#define __RT_TARGETING_H - -#include <errl/errlentry.H> - -namespace TARGETING -{ - class Target; -} - -namespace RT_TARG -{ - typedef uint64_t rtChipId_t; - - enum - { - MEMBUF_ID_SHIFT = 4, //!< CHIPID for MEMBUF is '<procid>MMMM'b - MEMBUF_ID_MASK = 0x0000000F, //!< valid position bits for MEMBUF - }; - - - /** - * @brief Convert a TARGETING::Target to an unit ID that can be used - * in calls to the runtime host - * @param[in] The HB TARGETING::Target - * @param[out] Sapphire target id - * @return an error handle on error - */ - errlHndl_t getRtTarget(const TARGETING::Target* i_target, - rtChipId_t &o_targetId); - - /** - * @brief Convert a runtime chip_id (target) into a TARGETING::Target - * @param[in] The rt chipId - * @param[out] The TARGETING::Target pointer - * @return error log handle on error else NULL - */ - errlHndl_t getHbTarget(rtChipId_t i_rt_chip_id, - TARGETING::Target *& o_target); - - /** - * @brief Save/Restore attribute values from current Reserved Memory data - * into new LID Structure data - * @param[in] Pointer to current Reserved Memory targeting binary data - * @param[in/out] Pointer to new LID Structure targeting binary data - * @param[in] Instance, ie, Node ID - * @return nullptr on success, else error log - */ - errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, - void *io_lidStructPtr, - uint8_t i_instance); - - /** - * @brief Validate LID Structure against Reserved Memory. Check that the - * TargetingHeader eyecatchers are valid, that the TargetingHeader number of - * sections match, and that the types and sizes of each TargetingSection - * match. - * @param[in] Pointer to new LID Structure targeting binary data - * @param[in] Pointer to current Reserved Memory targeting binary data - * @param[out] Total size of all sections in the new lid - * @return nullptr on success, else error log - */ - errlHndl_t validateData(void *i_lidStructPtr, - void *i_rsvdMemPtr, - size_t& o_lidTotalSize); - - /** - * @brief Apply ATTR_TMP overrides to be available for run time - */ - void applyTempOverrides( ); - -}; - -#endif diff --git a/src/include/usr/runtime/runtime.H b/src/include/usr/runtime/runtime.H index 9d22e387b..eba9f68bf 100644 --- a/src/include/usr/runtime/runtime.H +++ b/src/include/usr/runtime/runtime.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -188,7 +188,7 @@ errlHndl_t sendSBESystemConfig(); // HOMER*8/OCC_Common/VPD/ATTR/HBRT_Image/Res/Res/Res // should be the same as HDAT_RHB_MAX_RANGE_ENTRIES_PER_NODE in // src/hdat/fsp/hdat.H -#define HB_RSV_MEM_NUM_PTRS 50 +#define HB_RSV_MEM_NUM_PTRS 60 //Note this means the Reserved Mem sub-section is the 6th //(0 based) of the MDT section (See HDAT spec 11.1.1) diff --git a/src/include/usr/runtime/runtime_reasoncodes.H b/src/include/usr/runtime/runtime_reasoncodes.H index 6b77d621a..8bc4c858d 100644 --- a/src/include/usr/runtime/runtime_reasoncodes.H +++ b/src/include/usr/runtime/runtime_reasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -66,6 +66,10 @@ namespace RUNTIME MOD_CHECK_HB_RES_MEM_LIMIT = 0x26, /**< populate_hbruntime.C */ MOD_INIT_RT_RES_MEM_TRACE_BUF = 0x27, /**< rt_rsvdtracebuffer.C */ MOD_OPEN_UNTRUSTED_SP_AREAS = 0x28, /**< populate_hbruntime.C */ + MOD_SEND_ATTRIBUTES_TO_FSP = 0x29, /**< hbrt_utilities.H */ + MOD_RT_DO_NVDIMM_OP = 0x2A, /**< rt_fwnotify.C */ + SET_ATTR_NVDIMM_ENCRYPTION_ENABLE = 0x2B, /**< rt_fwnotify.C */ + MOD_CONFIGURE_HBRT_HYP_IDS = 0x2C, }; enum RuntimeReasonCode @@ -139,6 +143,13 @@ namespace RUNTIME RC_SP_ATTN_AREA_OVERFLOW = RUNTIME_COMP_ID | 0x42, RC_SP_ATTN_AREA1_SIZE_OVERFLOW = RUNTIME_COMP_ID | 0x43, RC_UNKNOWN_LABEL = RUNTIME_COMP_ID | 0x44, + RC_NULL_FIRMWARE_MSG_PTR = RUNTIME_COMP_ID | 0x45, + RC_SERIALIZE_ATTRIBUTE_FAILED = RUNTIME_COMP_ID | 0x46, + RC_NO_SPACE_FOR_ATTRIBUTE_SERIALIZATION = RUNTIME_COMP_ID | 0x47, + RC_CANNOT_MAKE_ATTRIBUTE = RUNTIME_COMP_ID | 0x48, + RT_NO_OMI_TARGET_FOUND = RUNTIME_COMP_ID | 0x49, + RC_LOG_GARD_EVENT_UNKNOWN_ERROR_TYPE = RUNTIME_COMP_ID | 0x4A, + RC_LOG_GARD_EVENT = RUNTIME_COMP_ID | 0x4B, }; enum UserDetailsTypes |
