summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/usr/errldisplay/errldisplay.H7
-rw-r--r--src/usr/errldisplay/HBconfig8
-rw-r--r--src/usr/errldisplay/errldisplay.C399
-rw-r--r--src/usr/errldisplay/makefile5
-rwxr-xr-xsrc/usr/fapi2/platCreateHwpErrParser.pl141
5 files changed, 450 insertions, 110 deletions
diff --git a/src/include/usr/errldisplay/errldisplay.H b/src/include/usr/errldisplay/errldisplay.H
index 9c41af56c..4f7830be9 100644
--- a/src/include/usr/errldisplay/errldisplay.H
+++ b/src/include/usr/errldisplay/errldisplay.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2015 */
+/* Contributors Listed Below - COPYRIGHT 2013,2017 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
@@ -164,6 +164,11 @@ private:
* @brief Displays a "target" type error log component
*/
static void displayTarget (void *data, size_t size);
+
+ /**
+ * @brief Displays a HWPF error log user details
+ */
+ static void displayHwpf (void *data, size_t size, uint8_t i_type);
};
} // End namespace
diff --git a/src/usr/errldisplay/HBconfig b/src/usr/errldisplay/HBconfig
index 914764177..60a8786ca 100644
--- a/src/usr/errldisplay/HBconfig
+++ b/src/usr/errldisplay/HBconfig
@@ -4,3 +4,11 @@ config CONSOLE_OUTPUT_ERRORDISPLAY
help
This is used to display errlogs in a human readable form
Error Display will only work when the Console is configured
+
+config CONSOLE_OUTPUT_FFDCDISPLAY
+ default n
+ depends on CONSOLE_OUTPUT_ERRORDISPLAY
+ help
+ This is used to display verbose HWP error information to the
+ console in a a human readable form. Note it adds ~0.25 MB
+ to the extended image size
diff --git a/src/usr/errldisplay/errldisplay.C b/src/usr/errldisplay/errldisplay.C
index 8fa38224d..d54d4bb1f 100644
--- a/src/usr/errldisplay/errldisplay.C
+++ b/src/usr/errldisplay/errldisplay.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2015 */
+/* Contributors Listed Below - COPYRIGHT 2013,2017 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
@@ -66,6 +66,12 @@
#include <targeting/common/targetservice.H>
#include <targeting/common/iterators/targetiterator.H>
+#ifdef CONFIG_CONSOLE_OUTPUT_FFDCDISPLAY
+//Generated hearder files for HWP parsing
+#include <hbfwErrDisplayPlatHwpErr.H>
+#include <hbfwErrDisplayPlatHwpFFDC.H>
+#endif
+
namespace ERRORLOGDISPLAY
{
@@ -144,119 +150,269 @@ const char * ErrLogDisplay::findComponentName (compId_t i_compId)
return "unknown";
}
+void displayCalloutTarget (uint8_t * epRaw, size_t& o_size)
+{
+ // Data is formatted as a callout_ud_t followed by an entity path.
+ // Note that in error data unused entity path elements are
+ // eliminated, so use data to find the length
+ const uint8_t pathTypeLength = *epRaw;
+
+ //# of ep elements (2 bytes each) are in lower nibble of first elem
+ //Master sentinel is 0xF0 so size is correct @ 1
+ o_size = ((pathTypeLength & 0x0F) * 2)+1;
+
+ const char * ep_str = "MASTER PROCESSOR SENTINEL";
+ char * tmp_str = NULL;
+ if( *epRaw != HWAS::TARGET_IS_SENTINEL )
+ {
+ TARGETING::EntityPath ep;
+
+ if ((o_size > sizeof(TARGETING::EntityPath)))
+ {
+ ep_str = "MALFORMED UD Entity Path";
+ o_size = 0; //stay safe
+ }
+ else
+ {
+ memcpy (reinterpret_cast<uint8_t*>(&ep), epRaw,o_size);
+ tmp_str = ep.toString();
+ ep_str = tmp_str;
+ }
+ }
+
+ CONSOLE::displayf(NULL, " Target : %s", ep_str);
+ free(tmp_str);
+}
+
void ErrLogDisplay::displayCallout (void *data, size_t size)
{
+ CONSOLE::displayf(NULL,
+ "------------------------------------------------");
+
// Parse encoded callout data. See ErrlUserDetailsCallout class in
// errludcallout.C for (undocumented) encoding details.
if (size >= sizeof(HWAS::callout_ud_t))
{
HWAS::callout_ud_t* callout =
reinterpret_cast<HWAS::callout_ud_t*>(data);
- size_t l_curSize = sizeof(HWAS::callout_ud_t);
+
+ size_t displayTarget = 0;
+ bool displayGard = false;
+ HWAS::GARD_ErrorType l_gard = HWAS::GARD_Fatal;
+ bool displayDeconfig = false;
+ HWAS::DeconfigEnum l_deconfig = HWAS::DECONFIG;
switch ( callout->type )
{
case HWAS::CLOCK_CALLOUT:
- CONSOLE::displayf(NULL, " CLOCK ERROR" );
- CONSOLE::displayf(NULL, " clockType: %d",
- static_cast<int>( callout->clockType ) );
- break;
- case HWAS::BUS_CALLOUT:
- CONSOLE::displayf(NULL, " BUS ERROR" );
- CONSOLE::displayf(NULL, " busType: %d",
- static_cast<int>( callout->busType ) );
- // Data is formatted as a callout_ud_t followed by 2 entity paths
- // representing each side of the link.
- if (size < (l_curSize + sizeof(uint8_t)))
+ switch (callout->clockType)
{
- break;
- }
- callout++;
+#define case_CLOCK_TYPE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Clock Type : %s", #_type); break;
+ case_CLOCK_TYPE(TODCLK_TYPE)
+ case_CLOCK_TYPE(MEMCLK_TYPE)
+ case_CLOCK_TYPE(OSCREFCLK_TYPE)
+ case_CLOCK_TYPE(OSCPCICLK_TYPE)
+ default:
+ CONSOLE::displayf(NULL, " Clock Type : UNKNOWN 0x%X",
+ callout->clockType);
+ } // switch clockType
+#undef case_CLOCK_TYPE
+
+ displayGard = true;
+ l_gard = callout->clkGardErrorType;
+ displayDeconfig = true;
+ l_deconfig = callout->clkDeconfigState;
+ displayTarget = 1;
+ break;
- CONSOLE::displayf(NULL, " First link: " );
- if( *reinterpret_cast<uint8_t*>( callout )
- == HWAS::TARGET_IS_SENTINEL )
+ case HWAS::PART_CALLOUT:
+ switch (callout->partType)
{
- CONSOLE::displayf(NULL, "MASTER PROCESSOR SENTINEL" );
- }
- else
- {
- if (size < (l_curSize + sizeof(TARGETING::EntityPath)))
- {
- break;
- }
- l_curSize += sizeof(TARGETING::EntityPath);
-
- TARGETING::EntityPath *ep =
- reinterpret_cast<TARGETING::EntityPath*>( callout );
- CONSOLE::displayf(NULL, "%s", ep->toString() );
+#define case_PART_TYPE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Part Type : %s", #_type); break;
+ case_PART_TYPE(FLASH_CONTROLLER_PART_TYPE)
+ case_PART_TYPE(PNOR_PART_TYPE)
+ case_PART_TYPE(SBE_SEEPROM_PART_TYPE)
+ case_PART_TYPE(VPD_PART_TYPE)
+ case_PART_TYPE(LPC_SLAVE_PART_TYPE)
+ case_PART_TYPE(GPIO_EXPANDER_PART_TYPE)
+ case_PART_TYPE(SPIVID_SLAVE_PART_TYPE)
+ default:
+ CONSOLE::displayf(NULL, " Part Type : UNKNOWN 0x%X",
+ callout->partType);
+ } // switch partType
+#undef case_PART_TYPE
+
+ displayGard = true;
+ l_gard = callout->partGardErrorType;
+ displayDeconfig = true;
+ l_deconfig = callout->partDeconfigState;
+ displayTarget = 1;
+ break;
- if (size < (l_curSize + sizeof(uint8_t)) )
- {
- break;
- }
- ep++;
-
- CONSOLE::displayf(NULL, " Second link: " );
- if( *reinterpret_cast<uint8_t*>( ep )
- == HWAS::TARGET_IS_SENTINEL )
- {
- CONSOLE::displayf(NULL, "MASTER PROCESSOR SENTINEL" );
- }
- else
- {
- if (size < (l_curSize + sizeof(TARGETING::EntityPath)))
- {
- break;
- }
- CONSOLE::displayf(NULL, "%s", ep->toString() );
- }
- }
+ case HWAS::BUS_CALLOUT:
+ switch (callout->busType)
+ {
+#define case_BUS_TYPE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Bus Type : %s", #_type); break;
+ case_BUS_TYPE(FSI_BUS_TYPE)
+ case_BUS_TYPE(DMI_BUS_TYPE)
+ case_BUS_TYPE(A_BUS_TYPE)
+ case_BUS_TYPE(X_BUS_TYPE)
+ case_BUS_TYPE(I2C_BUS_TYPE)
+ case_BUS_TYPE(PSI_BUS_TYPE)
+ case_BUS_TYPE(O_BUS_TYPE)
+ default:
+ CONSOLE::displayf(NULL, " Bus Type : UNKNOWN 0x%X",
+ callout->busType);
+ } // switch partType
+#undef case_BUS_TYPE
+
+ // Data is formatted as a callout_ud_t followed by 2 entity
+ // paths representing each side of the link.
+ displayTarget = 2;
break;
+
case HWAS::HW_CALLOUT:
- CONSOLE::displayf(NULL, " HW CALLOUT" );
- CONSOLE::displayf(NULL, " Reporting CPU ID: %d",
- callout->cpuid );
- // Data is formatted as a callout_ud_t followed by an entity path.
- if (size < (l_curSize + sizeof(uint8_t)))
- {
- break;
- }
- callout++;
+ CONSOLE::displayf(NULL, " Callout type : Hardware Callout");
+ CONSOLE::displayf(NULL, " CPU id : %d", callout->cpuid);
+
+ displayGard = true;
+ l_gard = callout->gardErrorType;
+ displayDeconfig = true;
+ l_deconfig = callout->deconfigState;
+ displayTarget = 1;
+ break;
- CONSOLE::displayf(NULL, " Called out entity:" );
- if( *reinterpret_cast<uint8_t*>( callout )
- == HWAS::TARGET_IS_SENTINEL )
- {
- CONSOLE::displayf(NULL, "MASTER PROCESSOR SENTINEL" );
- }
- else
+ case HWAS::PROCEDURE_CALLOUT:
+ CONSOLE::displayf(NULL, " Callout type : Procedure Callout");
+ switch (callout->procedure)
{
- if (size < (l_curSize + sizeof(TARGETING::EntityPath)))
- {
+#define case_PROCEDURE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Procedure : %s", #_type); break;
+ case_PROCEDURE(EPUB_PRC_NONE)
+ case_PROCEDURE(EPUB_PRC_FIND_DECONFIGURED_PART)
+ case_PROCEDURE(EPUB_PRC_SP_CODE)
+ case_PROCEDURE(EPUB_PRC_PHYP_CODE)
+ case_PROCEDURE(EPUB_PRC_ALL_PROCS)
+ case_PROCEDURE(EPUB_PRC_ALL_MEMCRDS)
+ case_PROCEDURE(EPUB_PRC_INVALID_PART)
+ case_PROCEDURE(EPUB_PRC_LVL_SUPP)
+ case_PROCEDURE(EPUB_PRC_PROCPATH)
+ case_PROCEDURE(EPUB_PRC_NO_VPD_FOR_FRU)
+ case_PROCEDURE(EPUB_PRC_MEMORY_PLUGGING_ERROR)
+ case_PROCEDURE(EPUB_PRC_FSI_PATH)
+ case_PROCEDURE(EPUB_PRC_PROC_AB_BUS)
+ case_PROCEDURE(EPUB_PRC_PROC_XYZ_BUS)
+ case_PROCEDURE(EPUB_PRC_MEMBUS_ERROR)
+ case_PROCEDURE(EPUB_PRC_EIBUS_ERROR)
+ case_PROCEDURE(EPUB_PRC_POWER_ERROR)
+ case_PROCEDURE(EPUB_PRC_MEMORY_UE)
+ case_PROCEDURE(EPUB_PRC_PERFORMANCE_DEGRADED)
+ case_PROCEDURE(EPUB_PRC_HB_CODE)
+ case_PROCEDURE(EPUB_PRC_TOD_CLOCK_ERR)
+ case_PROCEDURE(EPUB_PRC_COOLING_SYSTEM_ERR)
+ case_PROCEDURE(EPUB_PRC_FW_VERIFICATION_ERR)
+ case_PROCEDURE(EPUB_PRC_GPU_ISOLATION_PROCEDURE)
+ default:
+ CONSOLE::displayf(NULL, " Procedure : UNKNOWN: 0x%X",
+ callout->procedure);
break;
- }
- TARGETING::EntityPath *ep =
- reinterpret_cast<TARGETING::EntityPath*>( callout );
- CONSOLE::displayf(NULL, "%s", ep->toString() );
- }
+ } // switch procedure
+#undef case_PROCEDURE
break;
- case HWAS::PROCEDURE_CALLOUT:
- CONSOLE::displayf(NULL, " PROCEDURE ERROR" );
- CONSOLE::displayf(NULL, " Procedure: %d",
- static_cast<int>( callout->procedure ) );
+ default:
+ CONSOLE::displayf(NULL, " Callout type : UNKNOWN: 0x%X",
+ callout->type);
break;
}
+
+
+ ///////////////////////////
+ // Display all the common stuff
+ ///////////////////////////
+
+ //Display the number of targets indicated above
+ uint8_t * epRaw = reinterpret_cast<uint8_t*>( callout+1 ); //ptr math
+ size_t l_size = 0;
+ for(size_t numT = 0 ; numT < displayTarget; numT++)
+ {
+ // Data is formatted as a callout_ud_t followed by an entity path
+ // Multiple EP are packed together
+ epRaw += l_size;
+ displayCalloutTarget(epRaw,l_size);
+ }
+
+ if(displayDeconfig)
+ {
+ switch (l_deconfig)
+ {
+#define case_DECONFIG_STATE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Deconfig State : %s", #_type); break;
+ case_DECONFIG_STATE(NO_DECONFIG)
+ case_DECONFIG_STATE(DECONFIG)
+ case_DECONFIG_STATE(DELAYED_DECONFIG)
+ default:
+ CONSOLE::displayf(NULL, " Deconfig State : UNKNOWN: 0x%X",
+ l_deconfig);
+ break;
+ } // switch deconfigState
+#undef case_DECONFIG_STATE
+ }
+
+ if(displayGard)
+ {
+ switch (l_gard)
+ {
+#define case_GARD_ERROR_TYPE(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " GARD Error Type : %s", #_type); break;
+ case_GARD_ERROR_TYPE(GARD_NULL)
+ case_GARD_ERROR_TYPE(GARD_User_Manual)
+ case_GARD_ERROR_TYPE(GARD_Unrecoverable)
+ case_GARD_ERROR_TYPE(GARD_Fatal)
+ case_GARD_ERROR_TYPE(GARD_Predictive)
+ case_GARD_ERROR_TYPE(GARD_Power)
+ case_GARD_ERROR_TYPE(GARD_PHYP)
+ case_GARD_ERROR_TYPE(GARD_Void)
+ default:
+ CONSOLE::displayf(NULL, " GARD Error Type : UNKNOWN: 0x%X",
+ l_gard);
+ break;
+ } // switch gardState
+#undef case_GARD_ERROR_TYPE
+ }
+
+ switch (callout->priority)
+ {
+#define case_PRIORITY(_type) \
+case HWAS::_type: CONSOLE::displayf(NULL, " Priority : %s", #_type); break;
+ case_PRIORITY(SRCI_PRIORITY_LOW)
+ case_PRIORITY(SRCI_PRIORITY_MEDC)
+ case_PRIORITY(SRCI_PRIORITY_MEDB)
+ case_PRIORITY(SRCI_PRIORITY_MEDA)
+ case_PRIORITY(SRCI_PRIORITY_MED)
+ case_PRIORITY(SRCI_PRIORITY_HIGH)
+ default:
+ CONSOLE::displayf(NULL, " Priority : UNKNOWN: 0x%X",
+ callout->priority);
+ break;
+ } // switch priority
+#undef case_PRIORITY
}
}
+//Display a "Target". This is a misnomer in that HB uses a "target"
+// User detail section for lots of things. We are only going to look
+// for HWPF subtypes and display those
+
void ErrLogDisplay::displayTarget(void *data, size_t size)
{
char *char_buf = reinterpret_cast<char*>( data );
// The first part of the buffer is a TargetLabel_t.
ERRORLOG::TargetLabel_t *label =
- reinterpret_cast<ERRORLOG::TargetLabel_t*>( char_buf );
+ reinterpret_cast<ERRORLOG::TargetLabel_t*>( char_buf );
if( label->tag == 0xffffffff )
{
@@ -269,13 +425,13 @@ void ErrLogDisplay::displayTarget(void *data, size_t size)
// We only care about the HUID and can look up the Target based on that.
char_buf += sizeof(ERRORLOG::TargetLabel_t);
TARGETING::AttributeTraits<TARGETING::ATTR_HUID>::Type *huid =
- reinterpret_cast<TARGETING::AttributeTraits<
- TARGETING::ATTR_HUID>::Type*>( char_buf );
+ reinterpret_cast<TARGETING::AttributeTraits<
+ TARGETING::ATTR_HUID>::Type*>( char_buf );
CONSOLE::displayf(NULL, " HUID: %08x", *huid );
// Look up the HUID across all targets.
for ( TARGETING::TargetIterator ti = TARGETING::targetService().begin();
- ti != TARGETING::targetService().end(); ++ti )
+ ti != TARGETING::targetService().end(); ++ti )
{
TARGETING::AttributeTraits<TARGETING::ATTR_HUID>::Type tmp_huid;
if( ti->tryGetAttr<TARGETING::ATTR_HUID>( tmp_huid ) &&
@@ -283,17 +439,48 @@ void ErrLogDisplay::displayTarget(void *data, size_t size)
{
TARGETING::Target *target = *ti;
CONSOLE::displayf(NULL,
- " Phys path: %s",
- target->getAttr<TARGETING::ATTR_PHYS_PATH>().toString() );
+ " Phys path: %s",
+ target->getAttr<TARGETING::ATTR_PHYS_PATH>().toString() );
CONSOLE::displayf(NULL,
- " Affinity path: %s",
- target->getAttr<TARGETING::ATTR_AFFINITY_PATH>().toString() );
+ " Affinity path: %s",
+ target->getAttr<TARGETING::ATTR_AFFINITY_PATH>().toString());
break;
}
}
}
}
+void ErrLogDisplay::displayHwpf(void *data, size_t size, uint8_t i_type)
+{
+#ifdef CONFIG_CONSOLE_OUTPUT_FFDCDISPLAY
+
+ uint32_t *word_buf = reinterpret_cast<uint32_t*>( data );
+
+ switch ( i_type )
+ {
+ case ERRORLOG::ERRL_UDT_STRING:
+ //this is error code str -- single word of data is HWPF RC
+ CONSOLE::displayf(NULL,
+ "------------------------------------------------");
+ fapi2::hbfwErrDisplayHwpRc(*word_buf);
+ break;
+
+ case ERRORLOG::ERRL_UDT_TARGET:
+ {
+ //this is HWPF FFDC. First word is hash, rest of data is hex
+ //reserve space for 16 words of data with spaces between
+
+ CONSOLE::displayf(NULL,
+ "------------------------------------------------");
+ void * buf = reinterpret_cast<void*>(
+ reinterpret_cast<char*>( data )+4);
+ fapi2::hbfwErrDisplayHwpRcFFDC(*word_buf,buf, size-4);
+ break;
+ }
+ }
+#endif
+}
+
//
// Display a human-readable form of an error.
void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err,
@@ -301,7 +488,6 @@ void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err,
{
TRACDCOMP( g_trac_errldisp, ENTER_MRK "ErrLogDisplay::msgDisplay" );
-
do
{
// Decide whether or not to skip the error log
@@ -315,9 +501,9 @@ void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err,
CONSOLE::displayf(NULL,
"================================================");
- CONSOLE::displayf(NULL, "Error reported by %s (0x%04X)",
+ CONSOLE::displayf(NULL, "Error reported by %s (0x%04X) PLID 0x%08X",
findComponentName( i_committerComp ),
- i_committerComp );
+ i_committerComp, i_err->plid() );
CONSOLE::displayf(NULL, " %s", info->descriptString);
CONSOLE::displayf(NULL, " ModuleId 0x%02x %s",
i_err->moduleId(), info->moduleName);
@@ -328,34 +514,33 @@ void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err,
CONSOLE::displayf(NULL, " UserData2 %s : 0x%016lx",
info->userData2String, i_err->getUserData2());
- // Loop through and print all of the user data sections.
+
+ // Loop through and print interesting user data sections.
for ( size_t i = 0; i < i_err->iv_SectionVector.size(); ++i )
{
ERRORLOG::ErrlUD *user_data = i_err->iv_SectionVector[i];
- CONSOLE::displayf(NULL, "User Data Section %d, type %c%c", (int) i,
- (user_data->iv_header.iv_sid >> 8) & 0xff,
- user_data->iv_header.iv_sid & 0xff );
- CONSOLE::displayf(NULL, " Subsection type 0x%02x",
- user_data->iv_header.iv_sst );
- CONSOLE::displayf(NULL, " ComponentId %s (0x%04x)",
- findComponentName( user_data->iv_header.iv_compId ),
- user_data->iv_header.iv_compId );
- switch ( user_data->iv_header.iv_sst )
+ //HWPF subsections abuse the rules... handle it special
+ if(user_data->iv_header.iv_compId == HWPF_COMP_ID)
{
- case ERRORLOG::ERRL_UDT_TARGET:
- CONSOLE::displayf(NULL, " TARGET" );
- displayTarget( user_data->iv_pData, user_data->iv_Size );
- break;
+ displayHwpf( user_data->iv_pData, user_data->iv_Size,
+ user_data->iv_header.iv_sst);
+ }
+ else
+ {
+ switch ( user_data->iv_header.iv_sst )
+ {
case ERRORLOG::ERRL_UDT_CALLOUT:
- CONSOLE::displayf(NULL, " CALLOUT" );
displayCallout( user_data->iv_pData, user_data->iv_Size );
break;
+
case ERRORLOG::ERRL_UDT_STRING:
- CONSOLE::displayf(NULL, " STRING" );
+ CONSOLE::displayf(NULL,
+ "------------------------------------------------");
CONSOLE::displayf(NULL,
" %s",
reinterpret_cast<char*>( user_data->iv_pData ) );
break;
+ }
}
}
diff --git a/src/usr/errldisplay/makefile b/src/usr/errldisplay/makefile
index 7c70f2bb5..c4561087d 100644
--- a/src/usr/errldisplay/makefile
+++ b/src/usr/errldisplay/makefile
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2013,2014
+# Contributors Listed Below - COPYRIGHT 2013,2017
# [+] Google Inc.
# [+] International Business Machines Corp.
#
@@ -35,3 +35,6 @@ include ${ROOTPATH}/config.mk
# To find errldisplaydata.C - it is generated
# by ../errl/parser/genErrlParsers.pl
vpath %.C ${GENDIR}
+
+#To find hbfwErrDisplayPlatHwpErr add extra include paths
+EXTRAINCDIR += ${GENDIR}/plugins
diff --git a/src/usr/fapi2/platCreateHwpErrParser.pl b/src/usr/fapi2/platCreateHwpErrParser.pl
index 6271080fe..15b729b5e 100755
--- a/src/usr/fapi2/platCreateHwpErrParser.pl
+++ b/src/usr/fapi2/platCreateHwpErrParser.pl
@@ -6,7 +6,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2015,2016
+# Contributors Listed Below - COPYRIGHT 2015,2017
# [+] International Business Machines Corp.
#
#
@@ -62,9 +62,13 @@ my $xml = new XML::Simple (KeyAttr=>[]);
#------------------------------------------------------------------------------
my $rcFile = $ARGV[0];
$rcFile .= "/";
+my $eDisFile = $rcFile;
$rcFile .= "hbfwPlatHwpErrParser.H";
open(TGFILE, ">", $rcFile);
+$eDisFile .= "hbfwErrDisplayPlatHwpErr.H";
+open(EDISFILE, ">", $eDisFile);
+
#------------------------------------------------------------------------------
# Print start of file information
#------------------------------------------------------------------------------
@@ -83,6 +87,17 @@ print TGFILE " uint32_t l_rc = ntohl(*(static_cast<uint32_t *>(i_pBuffer)));\
print TGFILE " switch(l_rc)\n";
print TGFILE " {\n";
+print EDISFILE "// hbfwErrDisplayPlatHwpErr.H\n";
+print EDISFILE "// This file is generated by perl script platCreateHwpErrParser.pl\n\n";
+print EDISFILE "#ifndef HBFWERRDISPLAYPLATHWPERR_H_\n";
+print EDISFILE "#define HBFWERRDISPLAYPLATHWPERR_H_\n\n";
+print EDISFILE "namespace fapi2\n";
+print EDISFILE "{\n\n";
+print EDISFILE "void hbfwErrDisplayHwpRc(const uint32_t i_hwpRc)\n";
+print EDISFILE "{\n";
+print EDISFILE " switch(i_hwpRc)\n";
+print EDISFILE " {\n";
+
#------------------------------------------------------------------------------
# For each XML file
#------------------------------------------------------------------------------
@@ -125,6 +140,11 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " i_parser.PrintString(\"HwpReturnCode\", \"$err->{rc}\");\n";
print TGFILE " i_parser.PrintString(\"HWP Error description\", \"$desc\");\n";
print TGFILE " break;\n";
+
+ print EDISFILE " case 0x$errHash24Bit:\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" HwpReturnCode : $err->{rc}\");\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" HWP Error description : $desc\");\n";
+ print EDISFILE " break;\n";
}
}
@@ -137,6 +157,11 @@ print TGFILE " if (i_buflen) {i_parser.PrintHexDump(i_pBuffer, i_buflen);
print TGFILE " }\n";
print TGFILE "}\n\n";
+print EDISFILE " default:\n";
+print EDISFILE " CONSOLE::displayf(NULL,\" Unrecognized Error ID : 0x%x\", i_hwpRc);\n";
+print EDISFILE " }\n";
+print EDISFILE "}\n\n";
+
#------------------------------------------------------------------------------
# Print end of file info
#------------------------------------------------------------------------------
@@ -144,10 +169,14 @@ print TGFILE "}\n\n";
print TGFILE "#endif\n";
print TGFILE "#endif\n";
+print EDISFILE "}\n\n";
+print EDISFILE "#endif\n";
+
#------------------------------------------------------------------------------
# Close output file
#------------------------------------------------------------------------------
close(TGFILE);
+close(EDISFILE);
#------------------------------------------------------------------------------
@@ -155,9 +184,14 @@ close(TGFILE);
#------------------------------------------------------------------------------
my $rcFile = $ARGV[0];
$rcFile .= "/";
+my $eDisFile = $rcFile;
$rcFile .= "hbfwPlatHwpErrParserFFDC.H";
open(TGFILE, ">", $rcFile);
+$eDisFile .= "hbfwErrDisplayPlatHwpFFDC.H";
+open(EDISFILE, ">", $eDisFile);
+
+
#------------------------------------------------------------------------------
# Print start of file information
#------------------------------------------------------------------------------
@@ -170,6 +204,14 @@ print TGFILE "#include <netinet/in.h>\n\n";
print TGFILE "namespace fapi2\n";
print TGFILE "{\n\n";
+print EDISFILE "// hbfwErrDisplayPlatHwpFFDC.H\n";
+print EDISFILE "// This file is generated by perl script platCreateHwpErrParser.pl\n\n";
+print EDISFILE "#ifndef HBFWERRDISPLAYPLATHWPFFDC_H_\n";
+print EDISFILE "#define HBFWERRDISPLAYPLATHWPFFDC_H_\n\n";
+print EDISFILE "#include <stdio.h>\n\n";
+print EDISFILE "namespace fapi2\n";
+print EDISFILE "{\n\n";
+
#------------------------------------------------------------------------------
# Print start of hbfwParseHwpFfdc function
#------------------------------------------------------------------------------
@@ -190,6 +232,39 @@ print TGFILE " l_buflen -= sizeof(l_ffdcId);\n";
print TGFILE " switch(l_ffdcId)\n";
print TGFILE " {\n";
+print EDISFILE "void printHex(uint8_t * i_buf,\n";
+print EDISFILE " const size_t i_size)\n";
+print EDISFILE "{\n";
+print EDISFILE " char hexStr[256] = {0,};\n";
+print EDISFILE " char * pHex = hexStr;\n";
+print EDISFILE " size_t strSize = (i_size < 32) ? (i_size) : 32 ;\n";
+print EDISFILE " size_t pos = 0;\n";
+print EDISFILE "\n";
+print EDISFILE " for(size_t i=0; i < strSize; i++)\n";
+print EDISFILE " {\n";
+print EDISFILE " pos += sprintf(pHex+pos,\"%02X\", i_buf[i]);\n";
+print EDISFILE "\n";
+print EDISFILE " if(((i+1) % 4) == 0)\n";
+print EDISFILE " {\n";
+print EDISFILE " pos += sprintf(pHex+pos,\" \");\n";
+print EDISFILE " }\n";
+print EDISFILE " }\n";
+print EDISFILE " CONSOLE::displayf(NULL,\" %s\",pHex);\n";
+print EDISFILE "}\n\n\n";
+
+print EDISFILE "void hbfwErrDisplayHwpRcFFDC(const uint32_t i_ffdcId,\n";
+print EDISFILE " void * i_pBuffer,\n";
+print EDISFILE " const uint32_t i_buflen)\n";
+print EDISFILE "{\n";
+print EDISFILE " const uint32_t CFAM_DATA_LEN = 4;\n";
+print EDISFILE " const uint32_t SCOM_DATA_LEN = 8;\n";
+print EDISFILE " const uint32_t POS_LEN = 4;\n";
+print EDISFILE " uint8_t * l_pBuffer = static_cast<uint8_t *>(i_pBuffer);\n";
+print EDISFILE " uint32_t l_buflen = i_buflen;\n\n";
+print EDISFILE " switch(i_ffdcId)\n";
+print EDISFILE " {\n";
+
+
#------------------------------------------------------------------------------
# For each XML file
#------------------------------------------------------------------------------
@@ -224,6 +299,12 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " i_parser.PrintNumber(\"Failed SCOM address\",\"%#016lX\",l_Address);}\n";
print TGFILE " break;\n";
+ print EDISFILE " case 0x$ffdcHash32Bit:\n";
+ print EDISFILE " { uint64_t l_Address =\n";
+ print EDISFILE " *(reinterpret_cast<uint64_t*>(l_pBuffer));\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" Failed SCOM address : %#016lX\",l_Address);}\n";
+ print EDISFILE " break;\n";
+
$ffdcName = $err->{rc} . "_pcb_pib_rc";
$ffdcHash128Bit = md5_hex($ffdcName);
$ffdcHash32Bit = substr($ffdcHash128Bit, 0, 8);
@@ -233,6 +314,10 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " i_parser.PrintNumber(\"PIB RC:\",\"%#08lX\",l_PibRc);}\n";
print TGFILE " break;\n";
+ print EDISFILE " case 0x$ffdcHash32Bit:\n";
+ print EDISFILE " {uint32_t l_PibRc = *(reinterpret_cast<uint32_t *>(l_pBuffer));\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" PIB RC : %#08lX\",l_PibRc);}\n";
+ print EDISFILE " break;\n";
}
foreach my $ffdc (@{$err->{ffdc}})
@@ -252,6 +337,14 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " if (l_buflen) ";
print TGFILE "{i_parser.PrintHexDump(l_pBuffer, l_buflen);}\n";
print TGFILE " break;\n";
+
+ print EDISFILE " case 0x$ffdcHash32Bit:\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" HwpReturnCode : $err->{rc}\");\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" FFDC : $ffdc\");\n";
+ print EDISFILE " if (l_buflen) ";
+ print EDISFILE " {printHex(l_pBuffer, l_buflen);}\n";
+ print EDISFILE " break;\n";
+
}
}
@@ -280,6 +373,21 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " l_pBuffer+= POS_LEN;\n";
print TGFILE " l_buflen -= POS_LEN;\n";
print TGFILE " }\n";
+
+ print EDISFILE " case 0x$ffdcHash32Bit:\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" Register FFDC : $ffdcName\");\n";
+ print EDISFILE " while (l_buflen > 0)\n";
+ print EDISFILE " {\n";
+ print EDISFILE " if (l_buflen >= POS_LEN)\n";
+ print EDISFILE " {\n";
+ print EDISFILE " uint32_t * l_pBufferTemp = reinterpret_cast<uint32_t *>(l_pBuffer);\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" Chip Position : %X\", *l_pBufferTemp);\n";
+ print EDISFILE " l_pBufferTemp = NULL;\n";
+ print EDISFILE " l_pBuffer+= POS_LEN;\n";
+ print EDISFILE " l_buflen -= POS_LEN;\n";
+ print EDISFILE " }\n";
+
+
foreach my $cfamRegister (@{$registerFfdc->{cfamRegister}})
{
print TGFILE " if (l_buflen >= CFAM_DATA_LEN)\n";
@@ -289,6 +397,14 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " l_pBuffer+= CFAM_DATA_LEN;\n";
print TGFILE " l_buflen -= CFAM_DATA_LEN;\n";
print TGFILE " }\n";
+
+ print EDISFILE " if (l_buflen >= CFAM_DATA_LEN)\n";
+ print EDISFILE " {\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" CFAM Register : $cfamRegister\");\n";
+ print EDISFILE " printHex(l_pBuffer, CFAM_DATA_LEN);\n";
+ print EDISFILE " l_pBuffer+= CFAM_DATA_LEN;\n";
+ print EDISFILE " l_buflen -= CFAM_DATA_LEN;\n";
+ print EDISFILE " }\n";
}
foreach my $scomRegister (@{$registerFfdc->{scomRegister}})
{
@@ -300,9 +416,20 @@ foreach my $argnum (1 .. $#ARGV)
print TGFILE " l_pBuffer+= SCOM_DATA_LEN;\n";
print TGFILE " l_buflen -= SCOM_DATA_LEN;\n";
print TGFILE " }\n";
+
+ print EDISFILE " if (l_buflen >= SCOM_DATA_LEN)\n";
+ print EDISFILE " {\n";
+ print EDISFILE " CONSOLE::displayf(NULL,\" SCOM Register : $scomRegister\");\n";
+ print EDISFILE " printHex(l_pBuffer, SCOM_DATA_LEN);\n";
+ print EDISFILE " l_pBuffer+= SCOM_DATA_LEN;\n";
+ print EDISFILE " l_buflen -= SCOM_DATA_LEN;\n";
+ print EDISFILE " }\n";
}
print TGFILE " }\n";
print TGFILE " break;\n";
+
+ print EDISFILE " }\n";
+ print EDISFILE " break;\n";
}
}
@@ -316,6 +443,14 @@ print TGFILE "{i_parser.PrintHexDump(l_pBuffer, l_buflen);}\n";
print TGFILE " }\n\n";
print TGFILE "}\n\n";
+print EDISFILE " default:\n";
+print EDISFILE " CONSOLE::displayf(NULL,\" Unrecognized FFDC : 0x%x\", i_ffdcId);\n";
+print EDISFILE " if (l_buflen) ";
+print EDISFILE " {printHex(l_pBuffer, l_buflen);}\n";
+print EDISFILE " }\n\n";
+print EDISFILE "}\n\n";
+
+
#------------------------------------------------------------------------------
# Print end of file info
#------------------------------------------------------------------------------
@@ -323,8 +458,12 @@ print TGFILE "}\n\n";
print TGFILE "#endif\n";
print TGFILE "#endif\n";
+print EDISFILE "}\n\n";
+print EDISFILE "#endif\n";
+
#------------------------------------------------------------------------------
# Close output file
#------------------------------------------------------------------------------
close(TGFILE);
+close(EDISFILE);
OpenPOWER on IntegriCloud