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>
open-power · Mar 23, 2017 · d87acea · d87acea
1 parent 98de8e6
commit d87acea
Show file tree

Hide file tree

Showing 16 changed files with 166 additions and 107 deletions.
diff --git a/src/bootloader/bl_pnorAccess.C b/src/bootloader/bl_pnorAccess.C
@@ -33,8 +33,6 @@
 #define BOOTLOADER_TRACE_W_BRK(args) TRACFCOMP(g_trac_pnor,"##args")
 #endif
 
-
-extern const char* cv_EYECATCHER[];
 /**
 * @brief Takes in a buffer containing a ToC, as well as a base address
          Returns out a boolean whether or not this toc was valid
@@ -66,8 +64,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE],
             // Set TI information but caller decides to TI or not
             /*@
              * @errortype
-             * @moduleid     MOD_PNORACC_READTOC
-             * @reasoncode   RC_CHK_NULL_BUFFER
+             * @moduleid     Bootloader::MOD_PNORACC_READTOC
+             * @reasoncode   Bootloader::RC_CHK_NULL_BUFFER
              * @userdata1[0:15]   TI_WITH_SRC
              * @userdata1[16:31]  TI_BOOTLOADER
              * @userdata1[32:63]  Failing address = 0
@@ -103,8 +101,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE],
             // Set TI information but caller decides to TI or not
             /*@
              * @errortype
-             * @moduleid     MOD_PNORACC_READTOC
-             * @reasoncode   RC_HDR_CHECKSUM_ERR
+             * @moduleid     Bootloader::MOD_PNORACC_READTOC
+             * @reasoncode   Bootloader::RC_HDR_CHECKSUM_ERR
              * @userdata1[0:15]   TI_WITH_SRC
              * @userdata1[16:31]  TI_BOOTLOADER
              * @userdata1[32:63]  Failing address = 0
@@ -133,8 +131,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE],
             // Set TI information but caller decides to TI or not
             /*@
              * @errortype
-             * @moduleid     MOD_PNORACC_READTOC
-             * @reasoncode   RC_CHECK_HEADER_ERR
+             * @moduleid     Bootloader::MOD_PNORACC_READTOC
+             * @reasoncode   Bootloader::RC_CHECK_HEADER_ERR
              * @userdata1[0:15]   TI_WITH_SRC
              * @userdata1[16:31]  TI_BOOTLOADER
              * @userdata1[32:63]  Failing address = 0
@@ -168,8 +166,8 @@ void bl_pnorAccess::readTOC(uint8_t i_tocBuffer[PNOR::TOC_SIZE],
             // Set TI information but caller decides to TI or not
             /*@
              * @errortype
-             * @moduleid     MOD_PNORACC_READTOC
-             * @reasoncode   RC_PARSE_ENTRIES_ERR
+             * @moduleid     Bootloader::MOD_PNORACC_READTOC
+             * @reasoncode   Bootloader::RC_PARSE_ENTRIES_ERR
              * @userdata1[0:15]   TI_WITH_SRC
              * @userdata1[16:31]  TI_BOOTLOADER
              * @userdata1[32:63]  Failing address = 0
@@ -277,8 +275,8 @@ void bl_pnorAccess::getHBBSection(uint64_t i_pnorEnd,
             BOOTLOADER_TRACE_W_BRK(BTLDR_TRC_PA_GETHBBSECTION_FINDTOC_NOHBB);
             /*@
              * @errortype
-             * @moduleid     MOD_PNORACC_GETHBBSECT
-             * @reasoncode   RC_NO_HBB_IN_TOC
+             * @moduleid     Bootloader::MOD_PNORACC_GETHBBSECT
+             * @reasoncode   Bootloader::RC_NO_HBB_IN_TOC
              * @userdata1[0:15]   TI_WITH_SRC
              * @userdata1[16:31]  TI_BOOTLOADER
              * @userdata1[32:63]  Failing address = 0

diff --git a/src/bootloader/bl_terminate.C b/src/bootloader/bl_terminate.C
@@ -43,8 +43,8 @@ void kernel_std_exception()
 
     /*@
      * @errortype
-     * @moduleid     MOD_BOOTLOADER_TERMINATE
-     * @reasoncode   RC_STD_EXCEPTION
+     * @moduleid     Bootloader::MOD_BOOTLOADER_TERMINATE
+     * @reasoncode   Bootloader::RC_STD_EXCEPTION
      * @userdata1[0:15]   TI_WITH_SRC
      * @userdata1[16:31]  TI_BOOTLOADER
      * @userdata1[32:63]  Exception vector address
@@ -69,8 +69,8 @@ void kernel_std_exception_w_dsisr()
 
     /*@
      * @errortype
-     * @moduleid     MOD_BOOTLOADER_TERMINATE
-     * @reasoncode   RC_STD_EX_W_DSISR
+     * @moduleid     Bootloader::MOD_BOOTLOADER_TERMINATE
+     * @reasoncode   Bootloader::RC_STD_EX_W_DSISR
      * @userdata1[0:15]   TI_WITH_SRC
      * @userdata1[16:31]  TI_BOOTLOADER
      * @userdata1[32:63]  Exception vector address
@@ -97,8 +97,8 @@ void kernel_std_exception_w_srr1()
 
     /*@
      * @errortype
-     * @moduleid     MOD_BOOTLOADER_TERMINATE
-     * @reasoncode   RC_STD_EX_W_SRR1
+     * @moduleid     Bootloader::MOD_BOOTLOADER_TERMINATE
+     * @reasoncode   Bootloader::RC_STD_EX_W_SRR1
      * @userdata1[0:15]   TI_WITH_SRC
      * @userdata1[16:31]  TI_BOOTLOADER
      * @userdata1[32:63]  Exception vector address
@@ -124,8 +124,8 @@ void kernel_hype_exception()
 
     /*@
      * @errortype
-     * @moduleid     MOD_BOOTLOADER_TERMINATE
-     * @reasoncode   RC_HYPE_EXCEPTION
+     * @moduleid     Bootloader::MOD_BOOTLOADER_TERMINATE
+     * @reasoncode   Bootloader::RC_HYPE_EXCEPTION
      * @userdata1[0:15]   TI_WITH_SRC
      * @userdata1[16:31]  TI_BOOTLOADER
      * @userdata1[32:63]  Exception vector address

diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C
@@ -216,7 +216,7 @@ namespace Bootloader{
                 BOOTLOADER_TRACE(BTLDR_TRC_MAIN_VERIFY_FAIL);
                 /*@
                  * @errortype
-                 * @moduleid     MOD_BOOTLOADER_VERIFY
+                 * @moduleid     Bootloader::MOD_BOOTLOADER_VERIFY
                  * @reasoncode   SECUREBOOT::RC_ROM_VERIFY
                  * @userdata1    ROM return code
                  * @userdata2    ROM_hw_params log
@@ -351,8 +351,8 @@ namespace Bootloader{
                 BOOTLOADER_TRACE_W_BRK(BTLDR_TRC_MAIN_REMOVEECC_FAIL);
                 /*@
                  * @errortype
-                 * @moduleid     MOD_BOOTLOADER_MAIN
-                 * @reasoncode   RC_REMOVE_ECC_FAIL
+                 * @moduleid     Bootloader::MOD_BOOTLOADER_MAIN
+                 * @reasoncode   Bootloader::RC_REMOVE_ECC_FAIL
                  * @userdata1[0:15]   TI_WITH_SRC
                  * @userdata1[16:31]  TI_BOOTLOADER
                  * @userdata1[32:63]  Failing address = 0

diff --git a/src/build/debug/Hostboot/BlTrace.pm b/src/build/debug/Hostboot/BlTrace.pm
@@ -65,6 +65,7 @@ my %traceText = (
     "E5" => "Utils checkHeader block count invalid",
     "E6" => "Utils checkHeader header size invalid",
     "E7" => "Utils parseEntries invalid section",
+    "E8" => "Utils SectionIdToString PNOR section id out of range",
     "F0" => "Main getHBBSection returned",
     "F1" => "Main removeECC returned error",
     "F2" => "PNOR Access readTOC checkForNullBuffer null buffer",

diff --git 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
@@ -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

diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H
@@ -67,6 +67,7 @@ enum SectionId
     POWERVM,        /**< Power VM data */
     RINGOVD,        /**< Ring override data */
     WOFDATA,        /**< VFRT data tables for WOF */
+    SBKT,           /**< SecureBoot Key Transition */
     NUM_SECTIONS,   /**< Number of defined sections */
 
     FIRST_SECTION = TOC,  /**< First section (for looping) */

diff --git a/src/usr/errl/parser/genErrlParsers.pl b/src/usr/errl/parser/genErrlParsers.pl
@@ -76,6 +76,8 @@
 my $compIdFile = $base."/src/include/usr/hbotcompid.H";
 my $compPath = $base."/src/usr";
 my $compIncPath = $base."/src/include/usr";
+my $compBlPath = $base."/src/bootloader";
+my $compBlIncPath = $base."/src/include/bootloader";
 my $genFilesPath = $base."/obj/genfiles";
 my $hbfwTermRcFile = $genFilesPath."/hbfw_term_rc.H";
 my $srcFileName = $genFilesPath."/srcListing";
@@ -91,9 +93,12 @@
 my @filesToParse;
 my @pluginDirsToParse;
 getReasonCodeFiles($compIncPath);
+getReasonCodeFiles($compBlIncPath);
 getFilesToParse($compPath);
 getFilesToParse($compIncPath);
 getFilesToParse($genFilesPath);
+getFilesToParse($compBlPath);
+getFilesToParse($compBlIncPath);
 getPluginDirsToParse($compPath);
 
 #Add kernel/lib files for TI SRC descriptions

diff --git a/src/usr/pnor/pnor_common.C b/src/usr/pnor/pnor_common.C
@@ -46,11 +46,6 @@ TRAC_INIT(&g_trac_pnor, PNOR_COMP_NAME, 4*KILOBYTE, TRACE::BUFFER_SLOW); //4K
 //#define TRACUCOMP(args...)  TRACFCOMP(args)
 #define TRACUCOMP(args...)
 
-/**
- * Eyecatcher strings for PNOR TOC entries
- */
-extern const char* cv_EYECATCHER[];
-
 
 /*
  * @brief determine the physical offset of the ffs entry
@@ -319,7 +314,7 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
                    addr -= headerSize;
 
                    l_errhdl = PNOR::extendHash(addr, headerSize,
-                                               cv_EYECATCHER[l_secId]);
+                                               PNOR::SectionIdToString(l_secId));
                    if (l_errhdl)
                    {
                        break;
@@ -333,7 +328,7 @@ errlHndl_t PNOR::parseTOC( uint8_t* i_tocBuffer,SectionData_t * o_TOC)
         tmpId ++ )
         {
             TRACFCOMP(g_trac_pnor, "%s:    size=0x%.8X  flash=0x%.8X ",
-                  cv_EYECATCHER[tmpId], o_TOC[tmpId].size,
+                  PNOR::SectionIdToString(tmpId), o_TOC[tmpId].size,
                   o_TOC[tmpId].flashAddr);
         }