diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2015-04-01 10:29:25 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-04-02 21:50:31 -0500 |
| commit | 70ba2af58d7d1d0b678d722ed419abc82face208 (patch) | |
| tree | 22224124cb22c9f2134449ca13ade506dd4b1ec0 /src/usr | |
| parent | cf8f849cc3d6126e31b4a411efba98bee066d88c (diff) | |
| download | talos-hostboot-70ba2af58d7d1d0b678d722ed419abc82face208.tar.gz talos-hostboot-70ba2af58d7d1d0b678d722ed419abc82face208.zip | |
Do not fail IPL for missing OSYS:SS data
Older planar vpd vintages may not have the OSYS record filled
in. We should allow the system to boot in this case without
logging any errors.
CQ: SW201885
Change-Id: Ia4f6440551b4bb6d4a849d24290c19667f3a6c6b
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16801
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/devtree/bld_devtree.C | 7 | ||||
| -rw-r--r-- | src/usr/errl/errlentry.C | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C index 622178ae1..a73c81274 100644 --- a/src/usr/devtree/bld_devtree.C +++ b/src/usr/devtree/bld_devtree.C @@ -1197,10 +1197,13 @@ errlHndl_t bld_fdt_system(devTree * i_dt, bool i_smallTree) } } } - // just commit any errors we get, this isn't critical + // just delete any errors we get, this isn't critical if( errhdl ) { - errlCommit(errhdl, DEVTREE_COMP_ID); + // since there are old parts out in the wild without + // this data, we can't log an error + delete errhdl; + errhdl = NULL; } if( !foundvpd ) //serial number not found, default to unavailable diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C index ed6b11aab..5469a2268 100644 --- a/src/usr/errl/errlentry.C +++ b/src/usr/errl/errlentry.C @@ -96,6 +96,7 @@ struct epubTargetTypeToSub_t // Target type to subsystem table. static const epubTargetTypeToSub_t TARGET_TO_SUBSYS_TABLE[] = { + { TARGETING::TYPE_NODE , EPUB_CEC_HDW_SUBSYS }, { TARGETING::TYPE_DIMM , EPUB_MEMORY_DIMM }, { TARGETING::TYPE_MEMBUF , EPUB_MEMORY_SUBSYS }, { TARGETING::TYPE_PROC , EPUB_PROCESSOR_SUBSYS }, |
