diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-03-20 13:07:42 -0500 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-03-23 10:05:07 -0400 |
| commit | d87aceae2d5e5cb66201af5f897b06fa1471d90e (patch) | |
| tree | 8ca50bf550c1b460d9dc686aed5839901ba5d3e8 /src/include/bootloader | |
| parent | 98de8e60e8395033bf1deed9ede0929ecb796841 (diff) | |
| download | talos-hostboot-d87aceae2d5e5cb66201af5f897b06fa1471d90e.tar.gz talos-hostboot-d87aceae2d5e5cb66201af5f897b06fa1471d90e.zip | |
Add PNOR SectionIdToString to replace direct access to cv_EYECATCHER
This catches if the const array size does not match the number of
pnor sections and out of range index errors
Also it adds genErrlParsing for bootloader files
Change-Id: I0a90816a7620022dec16bc7358a68ffbdade0083
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38159
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/include/bootloader')
| -rw-r--r-- | src/include/bootloader/bootloader_trace.H | 3 | ||||
| -rw-r--r-- | src/include/bootloader/hbblreasoncodes.H | 38 |
2 files changed, 23 insertions, 18 deletions
diff --git a/src/include/bootloader/bootloader_trace.H b/src/include/bootloader/bootloader_trace.H index 6de32997c..fb86e1c8b 100644 --- a/src/include/bootloader/bootloader_trace.H +++ b/src/include/bootloader/bootloader_trace.H @@ -141,6 +141,9 @@ enum BootloaderTraces /** Bootloader Utils parseEntries invalid section */ BTLDR_TRC_UTILS_PARSE_INVALID_SECTION = 0xE7, + /** Bootloader Utils SectionIdToString PNOR section id out of range*/ + BTLDR_TRC_UTILS_PARSE_PNOR_SECID_OUT_OF_RANGE = 0xE8, + /** Bootloader main getHBBSection returned error */ BTLDR_TRC_MAIN_GETHBBSECTION_FAIL = 0xF0, diff --git a/src/include/bootloader/hbblreasoncodes.H b/src/include/bootloader/hbblreasoncodes.H index 2b2ee0010..22abf9059 100644 --- a/src/include/bootloader/hbblreasoncodes.H +++ b/src/include/bootloader/hbblreasoncodes.H @@ -42,12 +42,13 @@ namespace Bootloader */ enum hbblModuleId { - MOD_BOOTLOADER_INVALID = 0x00, /**< Zero is an invalid module id */ - MOD_BOOTLOADER_TERMINATE = 0x01, /**< bl_terminate.C : save SRC */ - MOD_BOOTLOADER_MAIN = 0x02, /**< bootloader.C : main */ - MOD_PNORACC_READTOC = 0x03, /**< bl_pnorAccess.C : read TOC */ - MOD_PNORACC_GETHBBSECT = 0x04, /**< bl_pnorAccess.C : get HBB sect */ - MOD_BOOTLOADER_VERIFY = 0x05, /**< bootloader.C : verifyContainer */ + MOD_BOOTLOADER_INVALID = 0x00, /**< Zero is an invalid module id */ + MOD_BOOTLOADER_TERMINATE = 0x01, /**< bl_terminate.C : save SRC */ + MOD_BOOTLOADER_MAIN = 0x02, /**< bootloader.C : main */ + MOD_PNORACC_READTOC = 0x03, /**< bl_pnorAccess.C : read TOC */ + MOD_PNORACC_GETHBBSECT = 0x04, /**< bl_pnorAccess.C : get HBB sect */ + MOD_BOOTLOADER_VERIFY = 0x05, /**< bootloader.C : verifyContainer */ + MOD_BOOTLOADER_PNOR_SECID_TO_STR = 0x06 /**< pnor_utils.C : SectionIdToString */ }; @@ -59,18 +60,19 @@ namespace Bootloader */ enum hbblReasonCode { - RC_ASSERT = HBBL_COMP_ID | 0x01, /**< Assert */ - RC_SHUTDOWN = HBBL_COMP_ID | 0x02, /**< Shutdown */ - RC_STD_EXCEPTION = HBBL_COMP_ID | 0x03, /**< Standard Exception */ - RC_STD_EX_W_DSISR = HBBL_COMP_ID | 0x04, /**< Std Except w/ DSISR */ - RC_STD_EX_W_SRR1 = HBBL_COMP_ID | 0x05, /**< Std Except w/ SRR1 */ - RC_HYPE_EXCEPTION = HBBL_COMP_ID | 0x06, /**< Hypervisor Exception */ - RC_REMOVE_ECC_FAIL = HBBL_COMP_ID | 0x07, /**< Remove ECC Failed */ - RC_CHK_NULL_BUFFER = HBBL_COMP_ID | 0x08, /**< Check for NULL Buffr */ - RC_HDR_CHECKSUM_ERR = HBBL_COMP_ID | 0x09, /**< Hdr Checksum Error */ - RC_CHECK_HEADER_ERR = HBBL_COMP_ID | 0x0A, /**< Check Header Error */ - RC_PARSE_ENTRIES_ERR = HBBL_COMP_ID | 0x0B, /**< Parse Entries Error */ - RC_NO_HBB_IN_TOC = HBBL_COMP_ID | 0x0C, /**< No HBB Sect in TOC */ + RC_ASSERT = HBBL_COMP_ID | 0x01, /**< Assert */ + RC_SHUTDOWN = HBBL_COMP_ID | 0x02, /**< Shutdown */ + RC_STD_EXCEPTION = HBBL_COMP_ID | 0x03, /**< Standard Exception */ + RC_STD_EX_W_DSISR = HBBL_COMP_ID | 0x04, /**< Std Except w/ DSISR */ + RC_STD_EX_W_SRR1 = HBBL_COMP_ID | 0x05, /**< Std Except w/ SRR1 */ + RC_HYPE_EXCEPTION = HBBL_COMP_ID | 0x06, /**< Hypervisor Exception */ + RC_REMOVE_ECC_FAIL = HBBL_COMP_ID | 0x07, /**< Remove ECC Failed */ + RC_CHK_NULL_BUFFER = HBBL_COMP_ID | 0x08, /**< Check for NULL Buffr */ + RC_HDR_CHECKSUM_ERR = HBBL_COMP_ID | 0x09, /**< Hdr Checksum Error */ + RC_CHECK_HEADER_ERR = HBBL_COMP_ID | 0x0A, /**< Check Header Error */ + RC_PARSE_ENTRIES_ERR = HBBL_COMP_ID | 0x0B, /**< Parse Entries Error */ + RC_NO_HBB_IN_TOC = HBBL_COMP_ID | 0x0C, /**< No HBB Sect in TOC */ + RC_PNOR_SECID_OUT_OF_RANGE = HBBL_COMP_ID | 0x0D, /**< Requested PNOR SecId DNE in string array */ }; }; // end Bootloader |
