| Bill Hoffa | 6b3a41c | 2015-04-01 15:03:33 -0500 | [diff] [blame] | 1 | From 632df20fb598f38c246eb6ce93d972a9cbec4145 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dan Crowell <dcrowell@us.ibm.com> |
| 3 | Date: Wed, 1 Apr 2015 10:29:25 -0500 |
| 4 | Subject: [PATCH] Do not fail IPL for missing OSYS:SS data |
| 5 | |
| 6 | Older planar vpd vintages may not have the OSYS record filled |
| 7 | in. We should allow the system to boot in this case but log |
| 8 | an error pointing to the planar in need of update. |
| 9 | |
| 10 | CQ: SW201885 |
| 11 | Change-Id: Ia4f6440551b4bb6d4a849d24290c19667f3a6c6b |
| 12 | --- |
| 13 | src/usr/devtree/bld_devtree.C | 7 +++++-- |
| 14 | src/usr/errl/errlentry.C | 1 + |
| 15 | 2 files changed, 6 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C |
| 18 | index 622178a..a73c812 100644 |
| 19 | --- a/src/usr/devtree/bld_devtree.C |
| 20 | +++ b/src/usr/devtree/bld_devtree.C |
| 21 | @@ -1197,10 +1197,13 @@ errlHndl_t bld_fdt_system(devTree * i_dt, bool i_smallTree) |
| 22 | } |
| 23 | } |
| 24 | } |
| 25 | - // just commit any errors we get, this isn't critical |
| 26 | + // just delete any errors we get, this isn't critical |
| 27 | if( errhdl ) |
| 28 | { |
| 29 | - errlCommit(errhdl, DEVTREE_COMP_ID); |
| 30 | + // since there are old parts out in the wild without |
| 31 | + // this data, we can't log an error |
| 32 | + delete errhdl; |
| 33 | + errhdl = NULL; |
| 34 | } |
| 35 | |
| 36 | if( !foundvpd ) //serial number not found, default to unavailable |
| 37 | diff --git a/src/usr/errl/errlentry.C b/src/usr/errl/errlentry.C |
| 38 | index 2d604ce..967638f 100644 |
| 39 | --- a/src/usr/errl/errlentry.C |
| 40 | +++ b/src/usr/errl/errlentry.C |
| 41 | @@ -94,6 +94,7 @@ struct epubTargetTypeToSub_t |
| 42 | // Target type to subsystem table. |
| 43 | static const epubTargetTypeToSub_t TARGET_TO_SUBSYS_TABLE[] = |
| 44 | { |
| 45 | + { TARGETING::TYPE_NODE , EPUB_CEC_HDW_SUBSYS }, |
| 46 | { TARGETING::TYPE_DIMM , EPUB_MEMORY_DIMM }, |
| 47 | { TARGETING::TYPE_MEMBUF , EPUB_MEMORY_SUBSYS }, |
| 48 | { TARGETING::TYPE_PROC , EPUB_PROCESSOR_SUBSYS }, |
| 49 | -- |
| 50 | 1.7.4.1 |
| 51 | |