diff options
author | Mike Jones <mjjones@us.ibm.com> | 2013-01-22 09:41:25 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-02-08 16:49:45 -0600 |
commit | caf328ccd931de4ce4e4d285d1a4e5ddd151abb5 (patch) | |
tree | 650c28362fef4b7fd3d8e727d2b13e25f119434b /src/usr/hwpf/plat | |
parent | 7c50ac8fa046052334326fd4f3c8447cb0c9514d (diff) | |
download | talos-hostboot-caf328ccd931de4ce4e4d285d1a4e5ddd151abb5.tar.gz talos-hostboot-caf328ccd931de4ce4e4d285d1a4e5ddd151abb5.zip |
ERRL: Create Hostboot error log SRC/UD parser and deliver to FSP bld
A new script called genErrlParsers will scan the Hostboot code for
error log tags and create a SRC parser for each component. The
script will also scan the Hostboot code for plugin directories
containing User Detail Data parsers and will create a makefile
that is used by the FSP to build each component's SRC/UD parser.
Change-Id: I7113f6cd8069447a1caaa199aff199b663d59072
RTC: 47518
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2975
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/plat')
-rw-r--r-- | src/usr/hwpf/plat/fapiPlatAttributeService.C | 2 | ||||
-rwxr-xr-x | src/usr/hwpf/plat/fapiPlatCreateHwpErrParser.pl | 9 | ||||
-rw-r--r-- | src/usr/hwpf/plat/fapiPlatHwAccess.C | 12 | ||||
-rw-r--r-- | src/usr/hwpf/plat/fapiPlatHwpInvoker.C | 6 | ||||
-rw-r--r-- | src/usr/hwpf/plat/fapiPlatMvpdAccess.C | 2 | ||||
-rw-r--r-- | src/usr/hwpf/plat/fapiPlatSystemConfig.C | 38 |
6 files changed, 35 insertions, 34 deletions
diff --git a/src/usr/hwpf/plat/fapiPlatAttributeService.C b/src/usr/hwpf/plat/fapiPlatAttributeService.C index ebe686901..ec260b919 100644 --- a/src/usr/hwpf/plat/fapiPlatAttributeService.C +++ b/src/usr/hwpf/plat/fapiPlatAttributeService.C @@ -35,7 +35,7 @@ #include <targeting/common/targetservice.H> #include <errl/errlentry.H> #include <hwpf/plat/fapiPlatAttributeService.H> -#include <hwpf/plat/fapiPlatReasonCodes.H> +#include <hwpf/hwpf_reasoncodes.H> #include <vpd/spdenums.H> #include <devicefw/driverif.H> #include <hwas/common/hwas.H> diff --git a/src/usr/hwpf/plat/fapiPlatCreateHwpErrParser.pl b/src/usr/hwpf/plat/fapiPlatCreateHwpErrParser.pl index 762e7280b..e97ace6fa 100755 --- a/src/usr/hwpf/plat/fapiPlatCreateHwpErrParser.pl +++ b/src/usr/hwpf/plat/fapiPlatCreateHwpErrParser.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2012 +# COPYRIGHT International Business Machines Corp. 2012,2013 # # p1 # @@ -119,6 +119,7 @@ foreach my $argnum (1 .. $#ARGV) my $errHash24Bit = substr($errHash128Bit, 0, 6); print TGFILE " case 0x$errHash24Bit:\n"; + print TGFILE " i_parser.PrintString(\"HwpReturnCode\", \"$err->{rc}\");\n"; print TGFILE " i_parser.PrintString(\"HWP Error description\", \"$desc\");\n"; print TGFILE " break;\n"; } @@ -179,13 +180,13 @@ foreach my $argnum (1 .. $#ARGV) # the same way as fapiParseErrorInfo.pl. This code must be kept in # sync #------------------------------------------------------------------ - my $ffdcName = $err->{rc} . "_"; - $ffdcName = $ffdcName . $ffdc; + my $ffdcName = $err->{rc} . "_" . $ffdc; my $ffdcHash128Bit = md5_hex($ffdcName); my $ffdcHash32Bit = substr($ffdcHash128Bit, 0, 8); print TGFILE " case 0x$ffdcHash32Bit:\n"; - print TGFILE " i_parser.PrintString(\"FFDC:\", \"$ffdcName\");\n"; + print TGFILE " i_parser.PrintString(\"HwpReturnCode\", \"$err->{rc}\");\n"; + print TGFILE " i_parser.PrintString(\"FFDC:\", \"$ffdc\");\n"; print TGFILE " if (l_buflen) "; print TGFILE "{i_parser.PrintHexDump(l_pBuffer, l_buflen);}\n"; print TGFILE " break;\n"; diff --git a/src/usr/hwpf/plat/fapiPlatHwAccess.C b/src/usr/hwpf/plat/fapiPlatHwAccess.C index 5b1f5ce6c..8f8a4f2b2 100644 --- a/src/usr/hwpf/plat/fapiPlatHwAccess.C +++ b/src/usr/hwpf/plat/fapiPlatHwAccess.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -52,10 +52,10 @@ #include <fapiHwAccess.H> #include <fapiPlatTrace.H> #include <fapiPlatHwAccess.H> +#include <hwpf/hwpf_reasoncodes.H> #include <errl/errlentry.H> #include <devicefw/userif.H> #include <ecmdDataBufferBase.H> -#include <fapiPlatReasonCodes.H> #include <targeting/common/predicates/predicates.H> #include <targeting/common/targetservice.H> #include <scan/scanif.H> @@ -237,8 +237,8 @@ static errlHndl_t verifyCfamAccessTarget(const fapi::Target& i_target) /*@ * @errortype - * @moduleid MOD_VERIFY_CFAM_ACCESS_TARGET - * @reasoncode RC_CFAM_ACCESS_ON_PROC_ERR + * @moduleid fapi::MOD_VERIFY_CFAM_ACCESS_TARGET + * @reasoncode fapi::RC_CFAM_ACCESS_ON_PROC_ERR * @userdata1 Target type * @devdesc Attempt to access CFAM register on a processor chip */ @@ -294,8 +294,8 @@ static errlHndl_t getCfamChipTarget(const TARGETING::Target* i_target, FAPI_ERR("getCfamChipTarget: Invalid number of parent chip for this target chiplet - # parent chips %d", l_list.size()); /*@ * @errortype - * @moduleid MOD_GET_CFAM_CHIP_TARGET - * @reasoncode RC_INVALID_NUM_PARENT_CHIP + * @moduleid fapi::MOD_GET_CFAM_CHIP_TARGET + * @reasoncode fapi::RC_INVALID_NUM_PARENT_CHIP * @userdata1 Number of parent chip found * @devdesc Invalid num of parent chip found for input CFAM target chiplet */ diff --git a/src/usr/hwpf/plat/fapiPlatHwpInvoker.C b/src/usr/hwpf/plat/fapiPlatHwpInvoker.C index fed7d3157..66753c655 100644 --- a/src/usr/hwpf/plat/fapiPlatHwpInvoker.C +++ b/src/usr/hwpf/plat/fapiPlatHwpInvoker.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -30,7 +30,7 @@ #include <fapiReturnCode.H> #include <fapiPlatTrace.H> #include <fapiErrorInfo.H> -#include <fapiPlatReasonCodes.H> +#include <hwpf/hwpf_reasoncodes.H> #include <errl/errlentry.H> namespace fapi @@ -180,7 +180,7 @@ errlHndl_t fapiRcToErrl(ReturnCode & io_rc) l_reasonCode &= 0xff; l_reasonCode |= HWPF_COMP_ID; - // HostBoot errlog tags for FAPI errors are in fapiPlatReasonCodes.H + // HostBoot errlog tags for FAPI errors are in hwpfReasonCodes.H l_pError = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, MOD_FAPI_RC_TO_ERRL, l_reasonCode); diff --git a/src/usr/hwpf/plat/fapiPlatMvpdAccess.C b/src/usr/hwpf/plat/fapiPlatMvpdAccess.C index 934137b61..a048b930f 100644 --- a/src/usr/hwpf/plat/fapiPlatMvpdAccess.C +++ b/src/usr/hwpf/plat/fapiPlatMvpdAccess.C @@ -30,8 +30,8 @@ #include <errl/errlentry.H> // fapi support -#include <hwpf/plat/fapiPlatReasonCodes.H> #include <fapiMvpdAccess.H> +#include <hwpf/hwpf_reasoncodes.H> // MVPD #include <devicefw/userif.H> diff --git a/src/usr/hwpf/plat/fapiPlatSystemConfig.C b/src/usr/hwpf/plat/fapiPlatSystemConfig.C index f07d0e15b..ef25ffd2b 100644 --- a/src/usr/hwpf/plat/fapiPlatSystemConfig.C +++ b/src/usr/hwpf/plat/fapiPlatSystemConfig.C @@ -30,7 +30,7 @@ #include <fapiPlatTrace.H> #include <fapiSystemConfig.H> -#include <fapiPlatReasonCodes.H> +#include <hwpf/hwpf_reasoncodes.H> #include <errl/errlentry.H> #include <targeting/common/commontargeting.H> #include <targeting/common/utilFilter.H> @@ -69,8 +69,8 @@ fapi::ReturnCode fapiGetOtherSideOfMemChannel( l_targetList.size()); /*@ * @errortype - * @moduleid fapi:MOD_FAPI_GET_OTHER_SIDE_OF_MEM_CHANNEL - * @reasoncode fapi:RC_NO_SINGLE_MCS + * @moduleid fapi::MOD_FAPI_GET_OTHER_SIDE_OF_MEM_CHANNEL + * @reasoncode fapi::RC_NO_SINGLE_MCS * @userdata1 Type of input target * @devdesc fapiGetOtherSideOfMemChannel could not find exactly * one target on the other side of the correct state @@ -104,8 +104,8 @@ fapi::ReturnCode fapiGetOtherSideOfMemChannel( l_targetList.size()); /*@ * @errortype - * @moduleid fapi:MOD_FAPI_GET_OTHER_SIDE_OF_MEM_CHANNEL - * @reasoncode fapi:RC_NO_SINGLE_MEMBUFF + * @moduleid fapi::MOD_FAPI_GET_OTHER_SIDE_OF_MEM_CHANNEL + * @reasoncode fapi::RC_NO_SINGLE_MEMBUFF * @userdata1 Type of input target * @devdesc fapiGetOtherSideOfMemChannel could not find exactly * one target on the other side of the correct state @@ -204,8 +204,8 @@ fapi::ReturnCode fapiGetChildChiplets( i_chip.getType()); /*@ * @errortype - * @moduleid MOD_FAPI_GET_CHILD_CHIPLETS - * @reasoncode RC_INVALID_REQUEST + * @moduleid fapi::MOD_FAPI_GET_CHILD_CHIPLETS + * @reasoncode fapi::RC_INVALID_REQUEST * @userdata1 Type of input target * @devdesc fapiGetChildChiplets request for non-chip */ @@ -248,8 +248,8 @@ fapi::ReturnCode fapiGetChildChiplets( i_chipletType); /*@ * @errortype - * @moduleid MOD_FAPI_GET_CHILD_CHIPLETS - * @reasoncode RC_UNSUPPORTED_REQUEST + * @moduleid fapi::MOD_FAPI_GET_CHILD_CHIPLETS + * @reasoncode fapi::RC_UNSUPPORTED_REQUEST * @userdata1 Type of requested chiplet * @devdesc fapiGetChildChiplets request for unsupported * or invalid chiplet type @@ -275,8 +275,8 @@ fapi::ReturnCode fapiGetChildChiplets( FAPI_ERR("fapiGetChildChiplets. Embedded NULL target pointer"); /*@ * @errortype - * @moduleid MOD_FAPI_GET_CHILD_CHIPLETS - * @reasoncode RC_EMBEDDED_NULL_TARGET_PTR + * @moduleid fapi::MOD_FAPI_GET_CHILD_CHIPLETS + * @reasoncode fapi::RC_EMBEDDED_NULL_TARGET_PTR * @devdesc fapi target has embedded null target pointer */ errlHndl_t l_pError = new ERRORLOG::ErrlEntry( @@ -345,8 +345,8 @@ fapi::ReturnCode fapiGetAssociatedDimms( FAPI_ERR("fapiGetAssociatedDimms. Embedded NULL target pointer"); /*@ * @errortype - * @moduleid MOD_FAPI_GET_ASSOCIATE_DIMMS - * @reasoncode RC_EMBEDDED_NULL_TARGET_PTR + * @moduleid fapi::MOD_FAPI_GET_ASSOCIATE_DIMMS + * @reasoncode fapi::RC_EMBEDDED_NULL_TARGET_PTR * @devdesc fapi target has embedded null target pointer */ errlHndl_t l_pError = new ERRORLOG::ErrlEntry( @@ -414,8 +414,8 @@ fapi::ReturnCode fapiGetParentChip( /*@ * @errortype - * @moduleid MOD_FAPI_GET_PARENT_CHIP - * @reasoncode RC_INVALID_REQUEST + * @moduleid fapi::MOD_FAPI_GET_PARENT_CHIP + * @reasoncode fapi::RC_INVALID_REQUEST * @userdata1 Type of input target * @devdesc fapiGetParentChip request for non-chiplet */ @@ -438,8 +438,8 @@ fapi::ReturnCode fapiGetParentChip( { /*@ * @errortype - * @moduleid MOD_FAPI_GET_PARENT_CHIP - * @reasoncode RC_EMBEDDED_NULL_TARGET_PTR + * @moduleid fapi::MOD_FAPI_GET_PARENT_CHIP + * @reasoncode fapi::RC_EMBEDDED_NULL_TARGET_PTR * @devdesc fapi target has embedded null target pointer */ errlHndl_t l_pError = new ERRORLOG::ErrlEntry( @@ -461,8 +461,8 @@ fapi::ReturnCode fapiGetParentChip( FAPI_ERR("fapiGetParentChip. Parent not found"); /*@ * @errortype - * @moduleid MOD_FAPI_GET_PARENT_CHIP - * @reasoncode RC_NO_SINGLE_PARENT + * @moduleid fapi::MOD_FAPI_GET_PARENT_CHIP + * @reasoncode fapi::RC_NO_SINGLE_PARENT * @devdesc fapiGetParentChip request did not find one parent */ errlHndl_t l_pError = new ERRORLOG::ErrlEntry( |