Skip to content

Commit 228beb5

Browse files
committed
PRD: add more descriptive signatures to IPL targeted diags
Change-Id: Iad30a478d27b5799555672387979eb104921db9d Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38712 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38745 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
1 parent cf68bfd commit 228beb5

File tree

3 files changed

+40
-11
lines changed

3 files changed

+40
-11
lines changed

src/usr/diag/prdf/common/plat/mem/prdfP9McaExtraSig.H

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828

2929
#include <prdrSignatures.H>
3030

31+
PRDR_ERROR_SIGNATURE(StartVcmPhase1, 0xffff0000, "", "VCM: Starting phase 1");
32+
PRDR_ERROR_SIGNATURE(StartVcmPhase2, 0xffff0001, "", "VCM: Starting phase 2");
33+
PRDR_ERROR_SIGNATURE(StartDsdPhase1, 0xffff0002, "", "DSD: Starting phase 1");
34+
PRDR_ERROR_SIGNATURE(StartDsdPhase2, 0xffff0003, "", "DSD: Starting phase 2");
35+
PRDR_ERROR_SIGNATURE(StartTpsPhase1, 0xffff0004, "", "TPS: Starting phase 1");
36+
PRDR_ERROR_SIGNATURE(StartTpsPhase2, 0xffff0005, "", "TPS: Starting phase 2");
37+
PRDR_ERROR_SIGNATURE(EndTpsPhase2, 0xffff0006, "", "TPS: Phase 2 completed");
38+
3139
PRDR_ERROR_SIGNATURE(MaintUE, 0xffff0010, "", "Maintenance UE");
3240
PRDR_ERROR_SIGNATURE(MaintIUE, 0xffff0011, "", "Maintenance IUE");
3341
PRDR_ERROR_SIGNATURE(MaintMPE, 0xffff0012, "", "Maintenance MPE");

src/usr/diag/prdf/plat/mem/prdfMemTps_ipl.C

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,22 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
6262
//phase 0
6363
if ( TD_PHASE_0 == iv_phase )
6464
{
65-
//start TPS phase 1
65+
// Start TPS phase 1
66+
io_sc.service_data->AddSignatureList( iv_chip->getTrgt(),
67+
PRDFSIG_StartTpsPhase1 );
68+
6669
PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 1" );
70+
6771
o_rc = startTpsPhase1<TYPE_MCA>( iv_chip, iv_rank );
6872
if ( SUCCESS != o_rc )
6973
{
70-
PRDF_ERR( PRDF_FUNC "Call to 'startTpsPhase1 failed on chip: "
71-
"0x%08x", iv_chip->getHuid() );
74+
PRDF_ERR( PRDF_FUNC "startTpsPhase1(0x%08x,m%ds%d) failed",
75+
iv_chip->getHuid(), iv_rank.getMaster(),
76+
iv_rank.getSlave() );
7277
break;
7378
}
74-
iv_phase = TD_PHASE_1;
7579

80+
iv_phase = TD_PHASE_1;
7681
}
7782
//phase 1/2
7883
else
@@ -159,15 +164,21 @@ uint32_t TpsEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
159164
//phase 1
160165
if ( TD_PHASE_1 == iv_phase )
161166
{
162-
//Start TPS phase 2
167+
// Start TPS phase 2
168+
io_sc.service_data->AddSignatureList( iv_chip->getTrgt(),
169+
PRDFSIG_StartTpsPhase2 );
170+
163171
PRDF_TRAC( PRDF_FUNC "Starting TPS Phase 2" );
172+
164173
o_rc = startTpsPhase2<TYPE_MCA>( iv_chip, iv_rank );
165174
if ( SUCCESS != o_rc )
166175
{
167-
PRDF_ERR( PRDF_FUNC "Call to 'startTpsPhase2 failed on "
168-
"chip: 0x%08x", iv_chip->getHuid() );
176+
PRDF_ERR( PRDF_FUNC "startTpsPhase2(0x%08x,m%ds%d) "
177+
"failed", iv_chip->getHuid(),
178+
iv_rank.getMaster(), iv_rank.getSlave() );
169179
break;
170180
}
181+
171182
iv_phase = TD_PHASE_2;
172183
}
173184
//phase 2

src/usr/diag/prdf/plat/mem/prdfMemVcm_ipl.C

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,20 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
5959
//phase 0
6060
if ( TD_PHASE_0 == iv_phase )
6161
{
62-
//start VCM phase 1
62+
// Start VCM phase 1
63+
io_sc.service_data->AddSignatureList( iv_chip->getTrgt(),
64+
PRDFSIG_StartVcmPhase1 );
65+
6366
PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 1" );
67+
6468
o_rc = startVcmPhase1<TYPE_MCA>( iv_chip, iv_rank );
6569
if ( SUCCESS != o_rc )
6670
{
6771
PRDF_ERR( PRDF_FUNC "startVcmPhase1(0x%08x, %d) failed",
6872
iv_chip->getHuid(), iv_rank.getMaster() );
6973
break;
7074
}
75+
7176
iv_phase = TD_PHASE_1;
7277
}
7378
//phase 1
@@ -112,15 +117,20 @@ uint32_t VcmEvent<TYPE_MCA>::nextStep( STEP_CODE_DATA_STRUCT & io_sc,
112117
}
113118
else
114119
{
115-
//Start VCM phase 2
120+
// Start VCM phase 2
121+
io_sc.service_data->AddSignatureList( iv_chip->getTrgt(),
122+
PRDFSIG_StartVcmPhase2 );
123+
116124
PRDF_TRAC( PRDF_FUNC "Starting VCM Phase 2" );
125+
117126
o_rc = startVcmPhase2<TYPE_MCA>( iv_chip, iv_rank );
118127
if ( SUCCESS != o_rc )
119128
{
120-
PRDF_ERR( PRDF_FUNC "Call to 'startVcmPhase2 failed on "
121-
"chip: 0x%08x", iv_chip->getHuid() );
129+
PRDF_ERR( PRDF_FUNC "startVcmPhase2(0x%08x, %d) failed",
130+
iv_chip->getHuid(), iv_rank.getMaster() );
122131
break;
123132
}
133+
124134
iv_phase = TD_PHASE_2;
125135
}
126136
}

0 commit comments

Comments
 (0)