Handle lack of overrides in regular RHB mode

A workaround was added to the code to allow attribute override
support on systems that are still using the old style of HBRT
data (not Reserved Hostboot Memory).  That code caused an error
to be thrown on systems that did use RHB.  The code was changed
to delete the error in this case insted of committing it.

Change-Id: I26e44965fbb0bf5ca73ca6d3e10feb01db28565d
CQ: SW386889
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39941
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: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C
index 92a937f03..0ceb99e26 100644
--- a/src/usr/targeting/runtime/attrPlatOverride_rt.C
+++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C
@@ -91,6 +91,7 @@ void applyTempOverrides()
 {
     TRACFCOMP(g_trac_targeting, ENTER_MRK"applyTempOverrides");
     errlHndl_t l_err = NULL;
+    bool l_usingStash = false;
 
     // Get a pointer to the reserved memory where HB
     //  saved the overrides during boot
@@ -108,6 +109,7 @@ void applyTempOverrides()
         }
         else
         {
+            //@fixme-RTC:169478-Remove this workaround once HDAT+PHYP is ready
             // grab the data we stashed at the end of the targeting data
             l_overAddr = g_hostInterfaces
               ->get_reserved_mem("ibm,hbrt-target-image",0);
@@ -116,6 +118,7 @@ void applyTempOverrides()
                 l_overAddr += (1*MEGABYTE - 64*KILOBYTE);
                 TRACFCOMP(g_trac_targeting, "NULL from get_reserved_mem, using stashed value at %.llX instead", l_overAddr );
                 l_overPtr = reinterpret_cast<uint8_t*>(l_overAddr);
+                l_usingStash = true;
             }
         }
     }
@@ -141,7 +144,16 @@ void applyTempOverrides()
     if (l_err)
     {
         TRACFCOMP(g_trac_targeting," HBRT: Failed applying overrides");
-        errlCommit( l_err, TARG_COMP_ID );
+        if( l_usingStash )
+        {
+            // if the new RHB is in use, this will always fail
+            //  so just delete the error
+            delete l_err;
+        }
+        else
+        {
+            errlCommit( l_err, TARG_COMP_ID );
+        }
     }
 
     TRACFCOMP(g_trac_targeting, EXIT_MRK"applyTempOverrides");