PRD: Add New Traces to TdCtlr

cnpalmer · zane131 · commit a9f99e45740d · 2017-03-22T17:53:50.000-04:00
Change-Id: Iaba71760735b2212ddd6a7f2ec618bad130f13b5 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38216 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@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/38261 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_ipl.C
@@ -78,6 +78,9 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )
     {
         if ( nextRank <= iv_stoppedRank ) // The command made it to the end.
         {
+            PRDF_TRAC( PRDF_FUNC "The TD command made it to the end of "
+                       "memory on chip: 0x%08x", iv_chip->getHuid() );
+
             // Clear all of the counters and maintenance ECC attentions. This
             // must be done before telling MDIA the command is done. Otherwise,
             // we may run into a race condition where MDIA may start the next
@@ -102,13 +105,20 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )
         }
         else // There is memory left to test.
         {
+            PRDF_TRAC( PRDF_FUNC "There is still memory left to test. "
+                       "Calling startSfRead<T>(0x%08x, m%ds%d)",
+                       nextRank.getChip()->getHuid(),
+                       nextRank.getRank().getMaster(),
+                       nextRank.getRank().getSlave() );
+
             // Start a super fast command to the end of memory.
             o_rc = startSfRead<T>( nextRank.getChip(), nextRank.getRank() );
             if ( SUCCESS != o_rc )
             {
-                PRDF_ERR( PRDF_FUNC "startSfRead<T>(0x%08x,%d) failed",
+                PRDF_ERR( PRDF_FUNC "startSfRead<T>(0x%08x,m%ds%d) failed",
                           nextRank.getChip()->getHuid(),
-                          nextRank.getRank().getMaster() );
+                          nextRank.getRank().getMaster(),
+                          nextRank.getRank().getSlave() );
                 break;
             }
         }
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr_rt.C
@@ -132,13 +132,20 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )
 
     do
     {
+        PRDF_TRAC( PRDF_FUNC "Resuming background scrub. "
+                   "Calling startBgScrub<T>(0x%08x, m%ds%d)",
+                   nextRank.getChip()->getHuid(),
+                   nextRank.getRank().getMaster(),
+                   nextRank.getRank().getSlave() );
+
         // Restart background scrubbing on the next rank.
         o_rc = startBgScrub<T>( nextRank.getChip(), nextRank.getRank() );
         if ( SUCCESS != o_rc )
         {
-            PRDF_ERR( PRDF_FUNC "startBgScrub<T>(0x%08x,%d) failed",
+            PRDF_ERR( PRDF_FUNC "startBgScrub<T>(0x%08x,m%ds%d) failed",
                       nextRank.getChip()->getHuid(),
-                      nextRank.getRank().getMaster() );
+                      nextRank.getRank().getMaster(),
+                      nextRank.getRank().getSlave() );
             break;
         }
 
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C
@@ -63,6 +63,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
         if ( TD_PHASE_0 == iv_phase )
         {
             //start TPS phase 1
+            PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 1" );
             o_rc = startTpsPhase1<TYPE_MCA>( iv_chip, iv_rank );
             if ( SUCCESS != o_rc )
             {
@@ -100,6 +101,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
             //if there was a UE or IUE
             if ( (eccAttns & MAINT_UE) || (eccAttns & MAINT_IUE) )
             {
+                PRDF_TRAC( PRDF_FUNC "UE Detected. Aborting this procedure." );
                 //UE
                 if ( eccAttns & MAINT_UE )
                 {
@@ -158,6 +160,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
                 if ( TD_PHASE_1 == iv_phase )
                 {
                     //Start TPS phase 2
+                    PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 2" );
                     o_rc = startTpsPhase2<TYPE_MCA>( iv_chip, iv_rank );
                     if ( SUCCESS != o_rc )
                     {
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemVcm_ipl.C b/src/usr/diag/prdf/plat/mem/prdfMemVcm_ipl.C
@@ -60,6 +60,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
         if ( TD_PHASE_0 == iv_phase )
         {
             //start VCM phase 1
+            PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 1" );
             o_rc = startVcmPhase1<TYPE_MCA>( iv_chip, iv_rank );
             if ( SUCCESS != o_rc )
             {
@@ -85,6 +86,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
             //if there was a UE or IUE
             if ( (eccAttns & MAINT_UE) || (eccAttns & MAINT_IUE) )
             {
+                PRDF_TRAC( PRDF_FUNC "UE Detected. Aborting this procedure." );
                 //UE
                 if ( eccAttns & MAINT_UE )
                 {
@@ -111,6 +113,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
             else
             {
                 //Start VCM phase 2
+                PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 2" );
                 o_rc = startVcmPhase2<TYPE_MCA>( iv_chip, iv_rank );
                 if ( SUCCESS != o_rc )
                 {
@@ -168,6 +171,8 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
             //else if there was a MCE
             else if ( eccAttns & MAINT_MCE )
             {
+                PRDF_TRAC( PRDF_FUNC "Chip mark verified" );
+
                 //The chip mark is verified
                 io_sc.service_data->setSignature( iv_chip->getHuid(),
                                                   PRDFSIG_VcmVerified );
@@ -187,6 +192,8 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
             //else - verification failed
             else
             {
+                PRDF_TRAC( PRDF_FUNC "Chip mark false alarm" );
+
                 io_sc.service_data->setSignature( iv_chip->getHuid(),
                                                   PRDFSIG_VcmFalseAlarm );
 

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,9 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )`
`78`	`78`	`{`
`79`	`79`	`if ( nextRank <= iv_stoppedRank ) // The command made it to the end.`
`80`	`80`	`{`
	`81`	`+ PRDF_TRAC( PRDF_FUNC "The TD command made it to the end of "`
	`82`	`+ "memory on chip: 0x%08x", iv_chip->getHuid() );`
	`83`	`+`
`81`	`84`	`// Clear all of the counters and maintenance ECC attentions. This`
`82`	`85`	`// must be done before telling MDIA the command is done. Otherwise,`
`83`	`86`	`// we may run into a race condition where MDIA may start the next`
`@@ -102,13 +105,20 @@ uint32_t MemTdCtlr<T>::defaultStep( STEP_CODE_DATA_STRUCT & io_sc )`
`102`	`105`	`}`
`103`	`106`	`else // There is memory left to test.`
`104`	`107`	`{`
	`108`	`+ PRDF_TRAC( PRDF_FUNC "There is still memory left to test. "`
	`109`	`+ "Calling startSfRead<T>(0x%08x, m%ds%d)",`
	`110`	`+ nextRank.getChip()->getHuid(),`
	`111`	`+ nextRank.getRank().getMaster(),`
	`112`	`+ nextRank.getRank().getSlave() );`
	`113`	`+`
`105`	`114`	`// Start a super fast command to the end of memory.`
`106`	`115`	`o_rc = startSfRead<T>( nextRank.getChip(), nextRank.getRank() );`
`107`	`116`	`if ( SUCCESS != o_rc )`
`108`	`117`	`{`
`109`		`- PRDF_ERR( PRDF_FUNC "startSfRead<T>(0x%08x,%d) failed",`
	`118`	`+ PRDF_ERR( PRDF_FUNC "startSfRead<T>(0x%08x,m%ds%d) failed",`
`110`	`119`	`nextRank.getChip()->getHuid(),`
`111`		`- nextRank.getRank().getMaster() );`
	`120`	`+ nextRank.getRank().getMaster(),`
	`121`	`+ nextRank.getRank().getSlave() );`
`112`	`122`	`break;`
`113`	`123`	`}`
`114`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`63`	`63`	`if ( TD_PHASE_0 == iv_phase )`
`64`	`64`	`{`
`65`	`65`	`//start TPS phase 1`
	`66`	`+ PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 1" );`
`66`	`67`	`o_rc = startTpsPhase1<TYPE_MCA>( iv_chip, iv_rank );`
`67`	`68`	`if ( SUCCESS != o_rc )`
`68`	`69`	`{`
`@@ -100,6 +101,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`100`	`101`	`//if there was a UE or IUE`
`101`	`102`	`if ( (eccAttns & MAINT_UE) \|\| (eccAttns & MAINT_IUE) )`
`102`	`103`	`{`
	`104`	`+ PRDF_TRAC( PRDF_FUNC "UE Detected. Aborting this procedure." );`
`103`	`105`	`//UE`
`104`	`106`	`if ( eccAttns & MAINT_UE )`
`105`	`107`	`{`
`@@ -158,6 +160,7 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`158`	`160`	`if ( TD_PHASE_1 == iv_phase )`
`159`	`161`	`{`
`160`	`162`	`//Start TPS phase 2`
	`163`	`+ PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 2" );`
`161`	`164`	`o_rc = startTpsPhase2<TYPE_MCA>( iv_chip, iv_rank );`
`162`	`165`	`if ( SUCCESS != o_rc )`
`163`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`60`	`60`	`if ( TD_PHASE_0 == iv_phase )`
`61`	`61`	`{`
`62`	`62`	`//start VCM phase 1`
	`63`	`+ PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 1" );`
`63`	`64`	`o_rc = startVcmPhase1<TYPE_MCA>( iv_chip, iv_rank );`
`64`	`65`	`if ( SUCCESS != o_rc )`
`65`	`66`	`{`
`@@ -85,6 +86,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`85`	`86`	`//if there was a UE or IUE`
`86`	`87`	`if ( (eccAttns & MAINT_UE) \|\| (eccAttns & MAINT_IUE) )`
`87`	`88`	`{`
	`89`	`+ PRDF_TRAC( PRDF_FUNC "UE Detected. Aborting this procedure." );`
`88`	`90`	`//UE`
`89`	`91`	`if ( eccAttns & MAINT_UE )`
`90`	`92`	`{`
`@@ -111,6 +113,7 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`111`	`113`	`else`
`112`	`114`	`{`
`113`	`115`	`//Start VCM phase 2`
	`116`	`+ PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 2" );`
`114`	`117`	`o_rc = startVcmPhase2<TYPE_MCA>( iv_chip, iv_rank );`
`115`	`118`	`if ( SUCCESS != o_rc )`
`116`	`119`	`{`
`@@ -168,6 +171,8 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`168`	`171`	`//else if there was a MCE`
`169`	`172`	`else if ( eccAttns & MAINT_MCE )`
`170`	`173`	`{`
	`174`	`+ PRDF_TRAC( PRDF_FUNC "Chip mark verified" );`
	`175`	`+`
`171`	`176`	`//The chip mark is verified`
`172`	`177`	`io_sc.service_data->setSignature( iv_chip->getHuid(),`
`173`	`178`	`PRDFSIG_VcmVerified );`
`@@ -187,6 +192,8 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,`
`187`	`192`	`//else - verification failed`
`188`	`193`	`else`
`189`	`194`	`{`
	`195`	`+ PRDF_TRAC( PRDF_FUNC "Chip mark false alarm" );`
	`196`	`+`
`190`	`197`	`io_sc.service_data->setSignature( iv_chip->getHuid(),`
`191`	`198`	`PRDFSIG_VcmFalseAlarm );`
`192`	`199`