diff options
| author | crgeddes <crgeddes@us.ibm.com> | 2016-10-06 16:15:09 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-10-10 13:41:19 -0400 |
| commit | 419fc706cfb77f1a67ff974ff84090fc6032fec3 (patch) | |
| tree | d33c0640f4c48d2739d0af597f3942aa3cca777b /src | |
| parent | 6153a67fcd13a717d607ca09894186a57509da2f (diff) | |
| download | talos-hostboot-419fc706cfb77f1a67ff974ff84090fc6032fec3.tar.gz talos-hostboot-419fc706cfb77f1a67ff974ff84090fc6032fec3.zip | |
Disable error catching for VPD lookup errors
Adding in a workaround to allow us to read VPD records
that are missing their table of contents in pnor
Change-Id: I99692031c56b4289791656cbfc595af34b6e5c9d
RTC: 162329
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30836
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/vpd/ipvpd.C | 68 |
1 files changed, 40 insertions, 28 deletions
diff --git a/src/usr/vpd/ipvpd.C b/src/usr/vpd/ipvpd.C index 4afe49ebe..be79f83c3 100644 --- a/src/usr/vpd/ipvpd.C +++ b/src/usr/vpd/ipvpd.C @@ -1085,37 +1085,49 @@ errlHndl_t IpVpdFacade::findRecordOffsetPnor ( const char * i_record, "No matching Record (%s) found in TOC!", i_record ); - /*@ - * @errortype - * @reasoncode VPD::VPD_RECORD_NOT_FOUND - * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE - * @moduleid VPD::VPD_IPVPD_FIND_RECORD_OFFSET - * @userdata1 Requested Record - * @userdata2 Requested Keyword - * @devdesc The requested record was not found in the VPD TOC. - */ - err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE, - VPD::VPD_IPVPD_FIND_RECORD_OFFSET, - VPD::VPD_RECORD_NOT_FOUND, - i_args.record, - i_args.keyword ); + // TODO RTC: 162329 Ignore missing records because some records are + // currently missing the Table of Contents are their start + if (!((* i_record == 'M') && + (*(i_record + 1) == 'E') && + (*(i_record + 2) == 'M') && + (*(i_record + 3) == 'D') )) + { + /*@ + * @errortype + * @reasoncode VPD::VPD_RECORD_NOT_FOUND + * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE + * @moduleid VPD::VPD_IPVPD_FIND_RECORD_OFFSET + * @userdata1 Requested Record + * @userdata2 Requested Keyword + * @devdesc The requested record was not found in the VPD TOC. + */ + err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE, + VPD::VPD_IPVPD_FIND_RECORD_OFFSET, + VPD::VPD_RECORD_NOT_FOUND, + i_args.record, + i_args.keyword ); - // Could be the VPD of the target wasn't set up properly - // -- DECONFIG so that we can possibly keep booting - err->addHwCallout( i_target, - HWAS::SRCI_PRIORITY_HIGH, - HWAS::DECONFIG, - HWAS::GARD_NULL ); - // Or FSP code didn't set up the VPD properly - err->addProcedureCallout(HWAS::EPUB_PRC_SP_CODE, - HWAS::SRCI_PRIORITY_MED); + // Could be the VPD of the target wasn't set up properly + // -- DECONFIG so that we can possibly keep booting + err->addHwCallout( i_target, + HWAS::SRCI_PRIORITY_HIGH, + HWAS::DECONFIG, + HWAS::GARD_NULL ); + // Or FSP code didn't set up the VPD properly + err->addProcedureCallout(HWAS::EPUB_PRC_SP_CODE, + HWAS::SRCI_PRIORITY_MED); - // Or HB code didn't look for the record properly - err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE, - HWAS::SRCI_PRIORITY_LOW); + // Or HB code didn't look for the record properly + err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE, + HWAS::SRCI_PRIORITY_LOW); - // Add trace to the log so we know what record was being requested. - err->collectTrace( "VPD", 256 ); + // Add trace to the log so we know what record was being requested. + err->collectTrace( "VPD", 256 ); + } + else + { + TRACFCOMP(g_trac_vpd, ERR_MRK"No TOC on MEMD record, assuming offset to be 0!"); + } } // Return the offset found, after byte swapping it. |
