Only allow key transition in istep 10.2

Nick Bofferding · dcrowell77 · commit d23603024bc4 · 2019-03-05T08:50:15.000-06:00
In certain cases, if a key transition driver was booted and the nest frequency had to be updated, the key transition flow would erroneously activate in istep 7.3 (call_mss_freq). This change confines key transitioning to istep 10.2 Change-Id: I450703e21bf68644298f77fcdfca62eae5c667e4 CQ: SW451376 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68690 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
diff --git a/src/include/usr/sbe/sbeif.H b/src/include/usr/sbe/sbeif.H
@@ -35,6 +35,16 @@ namespace SBE
 {
     typedef uint8_t sbe_image_version_t[SBE_IMAGE_VERSION_SIZE];
 
+    /**
+     *  @brief Enumeration indicating whether SBE SEEPROM update should
+     *      allow key transitioning (if applicable)
+     */
+    enum KEY_TRANSITION_PERM : uint8_t
+    {
+        INHIBIT_KEY_TRANSITION = 0x00,
+        ALLOW_KEY_TRANSITION   = 0x01,
+    };
+
     /**
      * @brief Gets a pointer to the proper SBE image in PNOR
      *
@@ -61,9 +71,14 @@ namespace SBE
      * @brief Iterates through all the functional processors and updates
      *        the SBE Image in a SEEPROM, if necessary.
      *
+     * @param[in] i_keyTransPerm Whether key transitions should be allowed
+     *     or inhibited (if applicable).  By default, they are inhibited.
+     *     Only istep 10.2 should allow key transitioning.
+     *
      * @return errlHndl_t    Error log handle on failure.
      */
-    errlHndl_t updateProcessorSbeSeeproms();
+    errlHndl_t updateProcessorSbeSeeproms(
+        KEY_TRANSITION_PERM i_keyTransPerm = INHIBIT_KEY_TRANSITION);
 
     /**
      * @brief Determines whether we are on the Golden side or not
diff --git a/src/usr/isteps/istep10/call_host_slave_sbe_update.C b/src/usr/isteps/istep10/call_host_slave_sbe_update.C
@@ -271,7 +271,8 @@ void* call_host_slave_sbe_update (void *io_pArgs)
 
         // Call to check state of Processor SBE SEEPROMs and
         // make any necessary updates
-        l_errl = SBE::updateProcessorSbeSeeproms();
+        l_errl = SBE::updateProcessorSbeSeeproms(
+            SBE::KEY_TRANSITION_PERM::ALLOW_KEY_TRANSITION);
 
         if (l_errl)
         {
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
@@ -113,7 +113,8 @@ using namespace TARGETING;
 
 namespace SBE
 {
-    errlHndl_t updateProcessorSbeSeeproms()
+    errlHndl_t updateProcessorSbeSeeproms(
+        const KEY_TRANSITION_PERM i_keyTransPerm)
     {
         errlHndl_t err = NULL;
         errlHndl_t err_cleanup = NULL;
@@ -258,8 +259,12 @@ namespace SBE
                  err = NULL;
             }
 
-            // Check if a key transition is needed
-            err = secureKeyTransition();
+            // Check if a key transition is allowed/needed
+            if(i_keyTransPerm == ALLOW_KEY_TRANSITION)
+            {
+                err = secureKeyTransition();
+            }
+
             if (err)
             {
                 TRACFCOMP( g_trac_sbe, ERR_MRK"updateProcessorSbeSeeproms() - failed secureKeyTransition");

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,8 @@ void* call_host_slave_sbe_update (void *io_pArgs)`
`271`	`271`
`272`	`272`	`// Call to check state of Processor SBE SEEPROMs and`
`273`	`273`	`// make any necessary updates`
`274`		`- l_errl = SBE::updateProcessorSbeSeeproms();`
	`274`	`+ l_errl = SBE::updateProcessorSbeSeeproms(`
	`275`	`+ SBE::KEY_TRANSITION_PERM::ALLOW_KEY_TRANSITION);`
`275`	`276`
`276`	`277`	`if (l_errl)`
`277`	`278`	`{`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ using namespace TARGETING;`
`113`	`113`
`114`	`114`	`namespace SBE`
`115`	`115`	`{`
`116`		`- errlHndl_t updateProcessorSbeSeeproms()`
	`116`	`+ errlHndl_t updateProcessorSbeSeeproms(`
	`117`	`+ const KEY_TRANSITION_PERM i_keyTransPerm)`
`117`	`118`	`{`
`118`	`119`	`errlHndl_t err = NULL;`
`119`	`120`	`errlHndl_t err_cleanup = NULL;`
`@@ -258,8 +259,12 @@ namespace SBE`
`258`	`259`	`err = NULL;`
`259`	`260`	`}`
`260`	`261`
`261`		`- // Check if a key transition is needed`
`262`		`- err = secureKeyTransition();`
	`262`	`+ // Check if a key transition is allowed/needed`
	`263`	`+ if(i_keyTransPerm == ALLOW_KEY_TRANSITION)`
	`264`	`+ {`
	`265`	`+ err = secureKeyTransition();`
	`266`	`+ }`
	`267`	`+`
`263`	`268`	`if (err)`
`264`	`269`	`{`
`265`	`270`	`TRACFCOMP( g_trac_sbe, ERR_MRK"updateProcessorSbeSeeproms() - failed secureKeyTransition");`