Skip to content

Commit 640ccb0

Browse files
cnpalmerdcrowell77
authored andcommitted
PRD: Rename new dimmBadDqBitmap functions
Change-Id: If677cc7d08b2502b7932bac768aeba6a353c90bc CQ: SW405539 CQ: SW405850 Backport: release-op910 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48640 Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent 5060d07 commit 640ccb0

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

src/include/usr/fapi2/dimmBadDqBitmapFuncs.H

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extern "C"
4949
*
5050
* @return ReturnCode
5151
*/
52-
fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
52+
fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target
5353
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
5454
const uint8_t i_dimm,
5555
const uint8_t i_rank,
@@ -74,7 +74,7 @@ fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
7474
*
7575
* @return ReturnCode
7676
*/
77-
fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
77+
fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target
7878
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
7979
const uint8_t i_dimm,
8080
const uint8_t i_rank,

src/usr/diag/prdf/common/plat/prdfPlatServices_common.C

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,13 +357,13 @@ int32_t getBadDqBitmap( TargetHandle_t i_trgt, const MemRank & i_rank,
357357

358358
fapi2::Target<l_trgtType> l_fapiTrgt( i_trgt );
359359

360-
FAPI_INVOKE_HWP( errl, dimmGetBadDqBitmap, l_fapiTrgt,
360+
FAPI_INVOKE_HWP( errl, p9DimmGetBadDqBitmap, l_fapiTrgt,
361361
i_rank.getDimmSlct(), i_rank.getRankSlct(),
362362
data[ps], ps );
363363

364364
if ( nullptr != errl )
365365
{
366-
PRDF_ERR( PRDF_FUNC "dimmGetBadDqBitmap() failed: i_trgt=0x%08x "
366+
PRDF_ERR( PRDF_FUNC "p9DimmGetBadDqBitmap() failed: i_trgt=0x%08x "
367367
"ps=%d ds=%d rs=%d", getHuid(i_trgt), ps,
368368
i_rank.getDimmSlct(), i_rank.getRankSlct() );
369369
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
@@ -423,13 +423,13 @@ int32_t setBadDqBitmap( TargetHandle_t i_trgt, const MemRank & i_rank,
423423

424424
fapi2::Target<l_trgtType> l_fapiTrgt( i_trgt );
425425

426-
FAPI_INVOKE_HWP( errl, dimmSetBadDqBitmap, l_fapiTrgt,
426+
FAPI_INVOKE_HWP( errl, p9DimmSetBadDqBitmap, l_fapiTrgt,
427427
i_rank.getDimmSlct(), i_rank.getRankSlct(),
428428
data[ps], ps );
429429

430430
if ( nullptr != errl )
431431
{
432-
PRDF_ERR( PRDF_FUNC "dimmSetBadDqBitmap() failed: "
432+
PRDF_ERR( PRDF_FUNC "p9DimmSetBadDqBitmap() failed: "
433433
"i_trgt=0x%08x ps=%d ds=%d rs=%d", getHuid(i_trgt),
434434
ps, i_rank.getDimmSlct(), i_rank.getRankSlct() );
435435
PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );

src/usr/diag/prdf/prdf_hb_only.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ prd_obj_no_sim += p9_l2_flush.o
183183

184184
prd_vpath += ${ROOTPATH}/src/import/chips/centaur/procedures/hwp/memory
185185
prd_obj_no_sim += p9c_mss_maint_cmds.o
186+
prd_obj_no_sim += p9c_dimmBadDqBitmapFuncs.o
186187

187188
prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/dimm/
188189
prd_vpath += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory/lib/eff_config/

src/usr/fapi2/dimmBadDqBitmapFuncs.C

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ fapi2::ReturnCode dimmBadDqCheckParamGetBitmap( const fapi2::Target
129129
}
130130

131131
//------------------------------------------------------------------------------
132-
fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
132+
fapi2::ReturnCode p9DimmGetBadDqBitmap( const fapi2::Target
133133
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
134134
const uint8_t i_dimm,
135135
const uint8_t i_rank,
136136
uint8_t (&o_data)[mss::BAD_DQ_BYTE_COUNT],
137137
const uint8_t i_port )
138138
{
139-
FAPI_INF( ">>dimmGetBadDqBitmap. %d:%d", i_dimm, i_rank );
139+
FAPI_INF( ">>p9DimmGetBadDqBitmap. %d:%d", i_dimm, i_rank );
140140

141141
fapi2::ReturnCode l_rc;
142142

@@ -150,28 +150,28 @@ fapi2::ReturnCode dimmGetBadDqBitmap( const fapi2::Target
150150
l_dimmTrgt, l_dqBitmap );
151151
if ( l_rc )
152152
{
153-
FAPI_ERR( "dimmGetBadDqBitmap: Error from "
153+
FAPI_ERR( "p9DimmGetBadDqBitmap: Error from "
154154
"dimmBadDqCheckParamGetBitmap." );
155155
break;
156156
}
157157
// Write contents of DQ bitmap for specific rank to o_data.
158158
memcpy( o_data, l_dqBitmap[i_rank], mss::BAD_DQ_BYTE_COUNT );
159159
}while(0);
160160

161-
FAPI_INF( "<<dimmGetBadDqBitmap" );
161+
FAPI_INF( "<<p9DimmGetBadDqBitmap" );
162162

163163
return l_rc;
164164
}
165165

166166
//------------------------------------------------------------------------------
167-
fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
167+
fapi2::ReturnCode p9DimmSetBadDqBitmap( const fapi2::Target
168168
<fapi2::TARGET_TYPE_MCA|fapi2::TARGET_TYPE_MBA> & i_fapiTrgt,
169169
const uint8_t i_dimm,
170170
const uint8_t i_rank,
171171
const uint8_t (&i_data)[mss::BAD_DQ_BYTE_COUNT],
172172
const uint8_t i_port )
173173
{
174-
FAPI_INF( ">>dimmSetBadDqBitmap. %d:%d", i_dimm, i_rank );
174+
FAPI_INF( ">>p9DimmSetBadDqBitmap. %d:%d", i_dimm, i_rank );
175175

176176
fapi2::ReturnCode l_rc;
177177

@@ -186,7 +186,7 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
186186
l_dimmTrgt, l_dqBitmap );
187187
if ( l_rc )
188188
{
189-
FAPI_ERR( "dimmSetBadDqBitmap: Error getting ATTR_BAD_DQ_BITMAP." );
189+
FAPI_ERR("p9DimmSetBadDqBitmap: Error getting ATTR_BAD_DQ_BITMAP.");
190190
break;
191191
}
192192
// Add the rank bitmap to the DIMM bitmap and write the bitmap.
@@ -197,7 +197,7 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
197197
l_errl = fapi2::platAttrSvc::getTargetingTarget(i_fapiTrgt, l_trgt);
198198
if ( l_errl )
199199
{
200-
FAPI_ERR( "dimmSetBadDqBitmap: Error from getTargetingTarget" );
200+
FAPI_ERR( "p9DimmSetBadDqBitmap: Error from getTargetingTarget" );
201201
break;
202202
}
203203

@@ -206,11 +206,11 @@ fapi2::ReturnCode dimmSetBadDqBitmap( const fapi2::Target
206206

207207
if ( l_rc )
208208
{
209-
FAPI_ERR( "dimmSetBadDqBitmap: Error setting ATTR_BAD_DQ_BITMAP." );
209+
FAPI_ERR("p9DimmSetBadDqBitmap: Error setting ATTR_BAD_DQ_BITMAP.");
210210
}
211211
}while(0);
212212

213-
FAPI_INF( "<<dimmSetBadDqBitmap" );
213+
FAPI_INF( "<<p9DimmSetBadDqBitmap" );
214214

215215
return l_rc;
216216
}

src/usr/isteps/istep14/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ OBJS += p9c_mss_unmask_errors.o
7777
OBJS += p9c_mss_power_cleanup.o
7878
OBJS += p9c_cen_stopclocks.o
7979
OBJS += p9c_mss_maint_cmds.o
80+
OBJS += p9c_dimmBadDqBitmapFuncs.o
8081

8182
#include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk
8283
#include ${PROCEDURE_PATH}/hwp/nest/p9_pcie_config.mk

0 commit comments

Comments
 (0)