diff options
Diffstat (limited to 'src/usr/errldisplay')
| -rw-r--r-- | src/usr/errldisplay/errldisplay.C | 9 | ||||
| -rw-r--r-- | src/usr/errldisplay/makefile | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/errldisplay/errldisplay.C b/src/usr/errldisplay/errldisplay.C index b8c26614e..3f04618cd 100644 --- a/src/usr/errldisplay/errldisplay.C +++ b/src/usr/errldisplay/errldisplay.C @@ -67,6 +67,7 @@ #include <targeting/common/targetservice.H> #include <targeting/common/iterators/targetiterator.H> #include <targeting/common/target.H> +#include <arch/ppc.H> #ifdef CONFIG_CONSOLE_OUTPUT_FFDCDISPLAY //Generated hearder files for HWP parsing @@ -325,6 +326,7 @@ case HWAS::_type: CONSOLE::displayf(NULL, " Bus Type : %s", #_t case_BUS_TYPE(I2C_BUS_TYPE) case_BUS_TYPE(PSI_BUS_TYPE) case_BUS_TYPE(O_BUS_TYPE) + case_BUS_TYPE(OMI_BUS_TYPE) default: CONSOLE::displayf(NULL, " Bus Type : UNKNOWN 0x%X", callout->busType); @@ -338,7 +340,6 @@ case HWAS::_type: CONSOLE::displayf(NULL, " Bus Type : %s", #_t case HWAS::HW_CALLOUT: CONSOLE::displayf(NULL, " Callout type : Hardware Callout"); - CONSOLE::displayf(NULL, " CPU id : %d", callout->cpuid); displayGard = true; l_gard = callout->gardErrorType; @@ -675,9 +676,9 @@ void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err, CONSOLE::displayf(NULL, "================================================"); - CONSOLE::displayf(NULL, "Error reported by %s (0x%04X) PLID 0x%08X", + CONSOLE::displayf(NULL, "Error reported by %s (0x%04X) EID 0x%08X", findComponentName( i_committerComp ), - i_committerComp, i_err->plid() ); + i_committerComp, i_err->eid() ); //PRD doesn't follow the rest of the HB conventions // Handle them special @@ -709,7 +710,7 @@ void ErrLogDisplay::msgDisplay (const errlHndl_t &i_err, displayHwpf( user_data->iv_pData, user_data->iv_Size, user_data->iv_header.iv_sst); } - else + else if(user_data->iv_header.iv_compId == ERRL_COMP_ID) { switch ( user_data->iv_header.iv_sst ) { diff --git a/src/usr/errldisplay/makefile b/src/usr/errldisplay/makefile index b094bfc63..a2fe4c9e4 100644 --- a/src/usr/errldisplay/makefile +++ b/src/usr/errldisplay/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2013,2017 +# Contributors Listed Below - COPYRIGHT 2013,2019 # [+] Google Inc. # [+] International Business Machines Corp. # @@ -48,3 +48,4 @@ EXTRAINCDIR += ${GENDIR}/plugins/prdf/ EXTRAINCDIR += ${ROOTPATH}/src/usr/diag/prdf/plugins/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/centaur/common/include/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/common/include/ |
