PRD: infinite loop in VcmFalseAlarm::init()

Change-Id: I3aa05539fae4c185eb56287f821517f339fe405b
CQ: SW397809
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44294
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44472
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdFalseAlarm.H b/src/usr/diag/prdf/plat/mem/prdfMemTdFalseAlarm.H
index 9b497f8be..ae619c287 100644
--- a/src/usr/diag/prdf/plat/mem/prdfMemTdFalseAlarm.H
+++ b/src/usr/diag/prdf/plat/mem/prdfMemTdFalseAlarm.H
@@ -136,6 +136,8 @@ class TdFalseAlarm
     /** Threshold for each entries in the map. */
     const TimeBasedThreshold iv_th;
 
+  protected: // instance variables
+
     /** A map containing the thresholds for each key. */
     std::map<uint32_t, TimeBasedThreshold> iv_thMap;
 };
@@ -200,7 +202,9 @@ class VcmFalseAlarm : public TdFalseAlarm
         uint32_t key = initThMap( i_rank );
 
         // Clear out the list of DRAMs if the threshold time has elapsed.
-        if ( elapsed(i_rank, io_sc) ) iv_dramMap[key].clear();
+        // Note that we cannot call elapsed() because it will do a recursive
+        // call to init().
+        if ( iv_thMap[key].timeElapsed(io_sc) ) iv_dramMap[key].clear();
 
         return key;
     }