enable saving GARD records to PNOR in runtime.

Change-Id: I1ada7061d8fb258431b64c8e02bf84b019f7b25c
CQ: SW315645
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19661
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Tested-by: Jenkins OP Build CI
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 12 insertions, 2 deletions

diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C
index ce4a174ec..fa266c881 100644
--- a/src/usr/hwas/common/deconfigGard.C
+++ b/src/usr/hwas/common/deconfigGard.C
@@ -58,6 +58,7 @@ namespace HWAS
 using namespace HWAS::COMMON;
 using namespace TARGETING;
 
+#ifndef __HOSTBOOT_RUNTIME
 //******************************************************************************
 errlHndl_t collectGard(const PredicateBase *i_pPredicate)
 {
@@ -100,6 +101,7 @@ errlHndl_t collectGard(const PredicateBase *i_pPredicate)
     }
     return errl;
 } // collectGard
+#endif
 
 //******************************************************************************
 DeconfigGard & theDeconfigGard()
@@ -123,6 +125,8 @@ DeconfigGard::~DeconfigGard()
     HWAS_MUTEX_DESTROY(iv_mutex);
     free(iv_platDeconfigGard);
 }
+
+#ifndef __HOSTBOOT_RUNTIME
 //******************************************************************************
 errlHndl_t DeconfigGard::applyGardRecord(Target *i_pTarget,
         GardRecord &i_gardRecord,
@@ -178,6 +182,7 @@ errlHndl_t DeconfigGard::applyGardRecord(Target *i_pTarget,
     while(0);
     return l_pErr;
 }//applyGardRecord
+
 //******************************************************************************
 errlHndl_t DeconfigGard::clearGardRecordsForReplacedTargets()
 {
@@ -2442,5 +2447,6 @@ void DeconfigGard::_clearFCODeconfigure(ConstTargetHandle_t i_nodeTarget)
         }
     }
 }
+#endif
 } // namespce HWAS
 
diff --git a/src/usr/hwas/hwasPlatDeconfigGard.C b/src/usr/hwas/hwasPlatDeconfigGard.C
index 36a05a6a0..0377cbd10 100644
--- a/src/usr/hwas/hwasPlatDeconfigGard.C
+++ b/src/usr/hwas/hwasPlatDeconfigGard.C
@@ -472,6 +472,7 @@ errlHndl_t _GardRecordIdSetup( void *&io_platDeconfigGard)
 
 void _flush(void *i_addr)
 {
+#ifndef __HOSTBOOT_RUNTIME
     HWAS_DBG("flushing GARD in PNOR: addr=%p", i_addr);
     int l_rc = mm_remove_pages(FLUSH, i_addr,
                 sizeof(DeconfigGard::GardRecord));
@@ -480,6 +481,10 @@ void _flush(void *i_addr)
         HWAS_ERR("mm_remove_pages(FLUSH,%p,%d) returned %d",
                 i_addr, sizeof(DeconfigGard::GardRecord),l_rc);
     }
+#else
+    HWAS_DBG("flushing all GARD in PNOR due to addr=%p", i_addr);
+    PNOR::flush(PNOR::GUARD_DATA);
+#endif
 }
 
 errlHndl_t getGardSectionInfo(PNOR::SectionInfo_t& o_sectionInfo)
@@ -510,8 +515,7 @@ errlHndl_t getGardSectionInfo(PNOR::SectionInfo_t& o_sectionInfo)
             }
             if (!l_sideInfo.isGuardPresent)
             {
-                HWAS_INF("getGardSectionInfo: No guard section disabling guard"
-                        " support");
+                HWAS_INF("getGardSectionInfo: No guard section; disabling guard support");
                 delete l_errl;
                 l_errl = NULL;
             }