From 08fd06fdc5c3e997ebc1e978cc3b42ad7082664c Mon Sep 17 00:00:00 2001 From: "Elizabeth K. Liner" Date: Thu, 23 Mar 2017 12:56:51 -0400 Subject: Revert "Adding in support for PHYP SRC and all 9 words" This reverts commit a0c2aa6132a0b49975327f5aa9238d1d3e2b750b. Change-Id: I6cfe36de59e6981ff23aa7d9aea1474f14729d2d Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38362 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/include/usr/errl/errlentry.H | 30 ++------------------- src/include/usr/errl/errlsrc.H | 40 ++++++---------------------- src/include/usr/errl/hberrltypes.H | 53 +++++++++++++++++--------------------- 3 files changed, 33 insertions(+), 90 deletions(-) (limited to 'src/include/usr/errl') diff --git a/src/include/usr/errl/errlentry.H b/src/include/usr/errl/errlentry.H index dde25243e..65f1c7240 100644 --- a/src/include/usr/errl/errlentry.H +++ b/src/include/usr/errl/errlentry.H @@ -134,34 +134,8 @@ public: const uint16_t i_reasonCode, const uint64_t i_user1 = 0, const uint64_t i_user2 = 0, - const bool i_hbSwError = false); + const bool i_hbSwError = false ); - /** - * @brief ErrlEntry constructor. Builds an error log with info - * constructed from the input. - * Event type, Sub System, SRC type, and Terminate state are defaulted - * to the most common values for Host Boot environment. These values - * can also be set to specific values by users if needed. - * For available values, see errltypes.H - * To understand the meaning of these values, refer to the - * Platform Event Log and SRC PLDD at: https://mcdoc.boeblingen.de. - * ibm.com/out/out.ViewDocument.php?documentid=1675 - * - * The backtrace is captured as user detail data. Use removeBackTrace to - * remove - * - * The order of parameters is arranged so that Host Boot error log - * is as close to SP as possible. - * - * @param[in] i_sev Log's severity. See errltypes.H for - * available values - * @param[in] i_srcWords The SRC words that will fill in other - * parameters - * @return None - */ - - ErrlEntry(const errlSeverity_t i_sev, - uint32_t i_srcWords[9]); /** * @brief Destructor * @@ -792,9 +766,9 @@ private: private: // Data Members - ErrlSrc iv_Src; // primary SRC section ErrlPrvt iv_Private; // private header object ErrlUH iv_User; // user header object + ErrlSrc iv_Src; // primary SRC section std::vector iv_SectionVector; // list of user defined sections std::vector iv_btAddrs; // list of addresses for the backtrace ErrlUserDetailsBackTrace * iv_pBackTrace; // Pointer to back trace diff --git a/src/include/usr/errl/errlsrc.H b/src/include/usr/errl/errlsrc.H index e08be1893..89bb21d82 100644 --- a/src/include/usr/errl/errlsrc.H +++ b/src/include/usr/errl/errlsrc.H @@ -84,14 +84,6 @@ private: uint64_t i_user1, uint64_t i_user2 ); - /** - * @brief Constructor. Pass in items destined for the primary SRC - * section in the error log. - * - * @param[in] i_srcWords SRC Words - * - */ - ErrlSrc( uint32_t i_srcWords[9]); /** @brief Destructor. */ ~ErrlSrc(); @@ -160,31 +152,15 @@ private: */ uint64_t aschex2bin(char c) const; - /* - * @brief Fill in the SRC words with current data. This is called - * at the beginning of flatten() - */ - void setSRCWords(); - - /* - * @brief Fill in the other class variables from the src words. - * This is only called if we go through the correct constructor - */ - void formatSRCWords(); - // Instance data - srcType_t iv_srcType : 8; // SRC type, the ?? in SRC ??xxxxxx - uint8_t iv_modId; // module ID - uint16_t iv_reasonCode; // reason code - epubSubSystem_t iv_ssid : 8 ; // subsystem type, the ?? in SRC xx??xxxx - uint64_t iv_user1; // user data 1 - uint64_t iv_user2; // user data 2 - bool iv_deconfig; // true if there is a deconfigure callout - bool iv_gard; // true if there is a gard callout - uint32_t iv_srcWords[9]; // filled in to match what PRD needs - - //when true, the error log is formed from the given src words. - bool iv_fromSRCWords; + srcType_t iv_srcType : 8; // SRC type, the ?? in SRC ??xxxxxx + uint8_t iv_modId; // module ID + uint16_t iv_reasonCode; // reason code + epubSubSystem_t iv_ssid : 8 ; // subsystem type, the ?? in SRC xx??xxxx + uint64_t iv_user1; // user data 1 + uint64_t iv_user2; // user data 2 + bool iv_deconfig; // true if there is a deconfigure callout + bool iv_gard; // true if there is a gard callout }; diff --git a/src/include/usr/errl/hberrltypes.H b/src/include/usr/errl/hberrltypes.H index 7ed897f40..480722301 100644 --- a/src/include/usr/errl/hberrltypes.H +++ b/src/include/usr/errl/hberrltypes.H @@ -84,36 +84,6 @@ namespace ERRORLOG { class ErrlEntry; }; ( (TO_UINT32(TWO_UINT8_TO_UINT16(mostleft_8, left_8)) << 16) | \ (TO_UINT32(TWO_UINT8_TO_UINT16(right_8, mostright_8))) ) - -/** - * @brief SRC type definitions - * Needs to fit into 1 byte for flattening purposes. - * - * This represents the byte in an SRC in position - * XX...... such as BC in BC81F00B. - * - * Refer to errlentry.H and this setter: - * void ErrlEntry::setSrcType(const srcType_t i_srcType) - * - */ -enum srcType_t -{ - SRCI_INTERVENTION_REQ = 0xA1, - SRCI_MACH_CHECK = 0xB1, - SRCI_ERR_INFO = 0xB1, - SRCI_IPL_STATUS = 0xC1, - SRCI_GENERAL_STATUS = 0xD1, - SRCI_DUMP_STATUS = 0xD1, - - HBT_INTERVENTION_REQ = 0xAC, - HBT_ERR_INFO = 0xBC, - HBT_IPL_STATUS = 0xCC, - HBT_GENERAL_STATUS = 0xDC, - - POWR_PHYP_STATUS = 0x10, -}; - - namespace ERRORLOG { @@ -234,6 +204,29 @@ enum errlEventType_t ERRL_ETYPE_CAPACITY_UPGRADE = 0x60, }; + + + +/** + * @brief SRC type definitions + * Needs to fit into 1 byte for flattening purposes. + * + * This represents the byte in an SRC in position + * XX...... such as BC in BC81F00B. + * + * Refer to errlentry.H and this setter: + * void ErrlEntry::setSrcType(const srcType_t i_srcType) + * + */ +enum srcType_t +{ + SRC_INTERVENTION_REQ = 0xAC, + SRC_ERR_INFO = 0xBC, + SRC_IPL_STATUS = 0xCC, + SRC_GENERAL_STATUS = 0xDC, +}; + + /** * @brief Sub system definitions * Needs to fit into 1 byte for flattening purposes. -- cgit v1.2.1