Skip to content

Commit 3d40df2

Browse files
Prachi Guptadcrowell77
Prachi Gupta
authored and
dcrowell77
committed
Changing NV target to OBUS_BRICK and mark it a child of OBUS
Change-Id: I17b52033d1e6811c320f201056708f31ef34d0e9 RTC:171597 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38481 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent da19466 commit 3d40df2

28 files changed

+870
-246
lines changed

‎src/build/debug/Hostboot/HwpfAttrOverride.pm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# OpenPOWER HostBoot Project
88
#
9-
# Contributors Listed Below - COPYRIGHT 2012,2016
9+
# Contributors Listed Below - COPYRIGHT 2012,2017
1010
# [+] International Business Machines Corp.
1111
#
1212
#
@@ -61,7 +61,7 @@ use constant TARGET_TYPE_MI => 0x00004000;
6161
use constant TARGET_TYPE_CAPP => 0x00008000;
6262
use constant TARGET_TYPE_DMI => 0x00010000;
6363
use constant TARGET_TYPE_OBUS => 0x00020000;
64-
use constant TARGET_TYPE_NV => 0x00040000;
64+
use constant TARGET_TYPE_OBUS_BRICK => 0x00040000;
6565
use constant TARGET_TYPE_SBE => 0x00080000;
6666
use constant TARGET_TYPE_PPE => 0x00100000;
6767
use constant TARGET_TYPE_PERV => 0x00200000;
@@ -649,10 +649,10 @@ sub main
649649
$targType = TARGET_TYPE_PHB;
650650
$targ =~ s/^.*pu.phb//;
651651
}
652-
elsif ($targ =~ /pu.nvbus/)
652+
elsif ($targ =~ /pu.obrick/)
653653
{
654-
$targType = TARGET_TYPE_NV;
655-
$targ =~ s/^.*pu.nvbus//;
654+
$targType = TARGET_TYPE_OBUS_BRICK;
655+
$targ =~ s/^.*pu.obrick//;
656656
}
657657
elsif ($targ =~ /pu.ppe/)
658658
{

‎src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace fapi2
100100
RC_PEC_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1a,
101101
RC_XBUS_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1b,
102102
RC_OBUS_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1c,
103-
RC_NV_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1d,
103+
RC_OBRICK_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1d,
104104
RC_PPE_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1e,
105105
RC_PERV_NO_PROC_FOUND = FAPI2_COMP_ID | 0x1f,
106106
RC_CAPP_NO_PROC_FOUND = FAPI2_COMP_ID | 0x20,

‎src/include/usr/fapi2/target.H

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -217,8 +217,8 @@ inline TARGETING::TYPE convertFapi2TypeToTargeting(fapi2::TargetType i_T)
217217
case fapi2::TARGET_TYPE_OBUS:
218218
o_targetingType = TARGETING::TYPE_OBUS;
219219
break;
220-
case fapi2::TARGET_TYPE_NV:
221-
o_targetingType = TARGETING::TYPE_NV;
220+
case fapi2::TARGET_TYPE_OBUS_BRICK:
221+
o_targetingType = TARGETING::TYPE_OBUS_BRICK;
222222
break;
223223
case fapi2::TARGET_TYPE_SBE:
224224
o_targetingType = TARGETING::TYPE_SBE;
@@ -314,8 +314,8 @@ inline fapi2::TargetType convertTargetingTypeToFapi2(TARGETING::TYPE i_T)
314314
case TARGETING::TYPE_OBUS:
315315
o_targetingType = fapi2::TARGET_TYPE_OBUS;
316316
break;
317-
case TARGETING::TYPE_NV:
318-
o_targetingType = fapi2::TARGET_TYPE_NV;
317+
case TARGETING::TYPE_OBUS_BRICK:
318+
o_targetingType = fapi2::TARGET_TYPE_OBUS_BRICK;
319319
break;
320320
case TARGETING::TYPE_SBE:
321321
o_targetingType = fapi2::TARGET_TYPE_SBE;
@@ -368,7 +368,7 @@ inline Target<T, V> Target<K, V>::getParent(void) const
368368
fapi2::TARGET_TYPE_CAPP |
369369
fapi2::TARGET_TYPE_DMI |
370370
fapi2::TARGET_TYPE_OBUS |
371-
fapi2::TARGET_TYPE_NV |
371+
fapi2::TARGET_TYPE_OBUS_BRICK |
372372
fapi2::TARGET_TYPE_SBE |
373373
fapi2::TARGET_TYPE_PPE |
374374
fapi2::TARGET_TYPE_PERV |
@@ -384,7 +384,7 @@ inline Target<T, V> Target<K, V>::getParent(void) const
384384
fapi2::TARGET_TYPE_XBUS |
385385
fapi2::TARGET_TYPE_OBUS |
386386
fapi2::TARGET_TYPE_CAPP |
387-
fapi2::TARGET_TYPE_NV |
387+
fapi2::TARGET_TYPE_OBUS_BRICK |
388388
fapi2::TARGET_TYPE_MCBIST |
389389
fapi2::TARGET_TYPE_MCS |
390390
fapi2::TARGET_TYPE_MCA |
@@ -559,13 +559,15 @@ inline Target<T, V> Target<K, V>::getParent(void) const
559559
(T != fapi2::TARGET_TYPE_PROC_CHIP)),
560560
"improper parent of fapi2::TARGET_TYPE_OBUS");
561561

562-
// valid parents for NV
563-
// NV -> PERV
564-
// NV -> PROC
565-
static_assert(!((K == fapi2::TARGET_TYPE_NV) &&
562+
// valid parents for OBUS_BRICK
563+
// OBUS_BRICK -> PERV
564+
// OBUS_BRICK -> OBUS
565+
// OBUS_BRICK -> PROC
566+
static_assert(!((K == fapi2::TARGET_TYPE_OBUS_BRICK) &&
566567
(T != fapi2::TARGET_TYPE_PERV) &&
568+
(T != fapi2::TARGET_TYPE_OBUS) &&
567569
(T != fapi2::TARGET_TYPE_PROC_CHIP)),
568-
"improper parent of fapi2::TARGET_TYPE_NV");
570+
"improper parent of fapi2::TARGET_TYPE_OBUS_BRICK");
569571

570572
// valid parents for CAPP
571573
// CAPP -> PERV
@@ -666,7 +668,7 @@ FAPI_DBG(ENTER_MRK "getChildren. Type 0x%08x State:0x%08x", T, i_state);
666668
(T != fapi2::TARGET_TYPE_XBUS) &&
667669
(T != fapi2::TARGET_TYPE_OBUS) &&
668670
(T != fapi2::TARGET_TYPE_CAPP) &&
669-
(T != fapi2::TARGET_TYPE_NV) &&
671+
(T != fapi2::TARGET_TYPE_OBUS_BRICK) &&
670672
(T != fapi2::TARGET_TYPE_MCBIST) &&
671673
(T != fapi2::TARGET_TYPE_MCS) &&
672674
(T != fapi2::TARGET_TYPE_MCA) &&
@@ -762,8 +764,8 @@ FAPI_DBG(ENTER_MRK "getChildren. Type 0x%08x State:0x%08x", T, i_state);
762764
"fapi2::TARGET_TYPE_CAPP has no children");
763765
static_assert((K != fapi2::TARGET_TYPE_OBUS),
764766
"fapi2::TARGET_TYPE_OBUS has no children");
765-
static_assert((K != fapi2::TARGET_TYPE_NV),
766-
"fapi2::TARGET_TYPE_NV has no children");
767+
static_assert((K != fapi2::TARGET_TYPE_OBUS_BRICK),
768+
"fapi2::TARGET_TYPE_OBUS_BRICK has no children");
767769
static_assert((K != fapi2::TARGET_TYPE_SBE),
768770
"fapi2::TARGET_TYPE_SBE has no children");
769771
static_assert((K != fapi2::TARGET_TYPE_PPE),

‎src/usr/errl/errlentry.C

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ extern char hbi_ImageId;
6262
using namespace ERRORLOG;
6363
using namespace HWAS;
6464

65-
6665
namespace ERRORLOG
6766
{
6867

‎src/usr/fapi2/plat_attr_override_sync.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -150,8 +150,8 @@ void directOverride()
150150
case fapi2::TARGET_TYPE_OBUS:
151151
l_targetType = TARGETING::TYPE_OBUS;
152152
break;
153-
case fapi2::TARGET_TYPE_NV:
154-
l_targetType = TARGETING::TYPE_NV;
153+
case fapi2::TARGET_TYPE_OBUS_BRICK:
154+
l_targetType = TARGETING::TYPE_OBUS_BRICK;
155155
break;
156156
case fapi2::TARGET_TYPE_SBE:
157157
l_targetType = TARGETING::TYPE_SBE;

‎src/usr/fapi2/plat_utils.C

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,9 @@ void xlateTargetType(const fapi2::TargetType i_targetType,
308308
o_class = TARGETING::CLASS_UNIT;
309309
o_type = TARGETING::TYPE_OBUS;
310310
break;
311-
case fapi2::TARGET_TYPE_NV:
311+
case fapi2::TARGET_TYPE_OBUS_BRICK:
312312
o_class = TARGETING::CLASS_UNIT;
313-
o_type = TARGETING::TYPE_NV;
313+
o_type = TARGETING::TYPE_OBUS_BRICK;
314314
break;
315315
case fapi2::TARGET_TYPE_SBE:
316316
o_class = TARGETING::CLASS_UNIT;
@@ -361,7 +361,7 @@ bool isPhysParentChild(const TargetType i_parentType,
361361
TARGET_TYPE_CAPP |
362362
TARGET_TYPE_DMI |
363363
TARGET_TYPE_OBUS |
364-
TARGET_TYPE_NV |
364+
TARGET_TYPE_OBUS_BRICK |
365365
TARGET_TYPE_SBE |
366366
TARGET_TYPE_PPE |
367367
TARGET_TYPE_PERV |

‎src/usr/fapi2/test/fapi2GetChildrenTest.H

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ void test_fapi2GetChildren()
304304
{ return i_perv.getChildren<fapi2::TARGET_TYPE_CAPP>(
305305
TARGET_STATE_PRESENT).size(); } },
306306

307-
// NV pervasive has 1 NV children
308-
{PERV_NV_CHILDREN,
307+
// OBUS pervasive has 3 OBUS BRICK children
308+
{PERV_OBUS_BRICK_CHILDREN,
309309
[](TARGETING::ATTR_CHIP_UNIT_type i_unit)
310-
{ return (i_unit == NV_RANGE); },
310+
{ return ((i_unit >= OBUS_LOW) && (i_unit <= OBUS_HIGH)); },
311311
[](Target<fapi2::TARGET_TYPE_PERV>& i_perv)
312-
{ return i_perv.getChildren<fapi2::TARGET_TYPE_NV>(
312+
{ return i_perv.getChildren<fapi2::TARGET_TYPE_OBUS_BRICK>(
313313
TARGET_STATE_PRESENT).size(); } },
314314

315315
// MCBIST/MCS/MCA pervasive has 1 MCBIST child

‎src/usr/fapi2/test/fapi2GetChipletNumTest.H

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -104,54 +104,58 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
104104
FAPI_INF("Complete testVerifyiPhbChipletNum");
105105
}
106106

107-
void testVerifyNvChipletNum()
107+
void testVerifyObusBrickChipletNum()
108108
{
109109
uint8_t l_chiplet_id = 0;
110110
uint8_t l_exp_chiplet_id = 0;
111+
uint8_t l_chip_unit = 0;
111112

112-
FAPI_INF ("Start testVerifyNvChipletNum");
113+
FAPI_INF ("Start testVerifyObusBrickChipletNum");
113114
do
114115
{
115-
// find the all NV units
116+
// find the all OBUS Brick units
116117
TARGETING::Target * pSys;
117118
TARGETING::targetService().getTopLevelTarget(pSys);
118-
TARGETING::PredicateCTM predNv(TARGETING::CLASS_UNIT,
119-
TARGETING::TYPE_NV);
119+
TARGETING::PredicateCTM predObusBrick(TARGETING::CLASS_UNIT,
120+
TARGETING::TYPE_OBUS_BRICK);
120121

121122
TARGETING::TargetHandleList l_TargetList;
122123
TARGETING::targetService().getAssociated( l_TargetList, pSys,
123124
TARGETING::TargetService::CHILD,
124125
TARGETING::TargetService::ALL,
125-
&predNv);
126+
&predObusBrick);
126127

127128
if (l_TargetList.empty())
128129
{
129-
TS_FAIL("testVerifyNvChipletNum: empty l_TargetList");
130+
TS_FAIL("testVerifyObusBrickChipletNum: empty l_TargetList");
130131
break;
131132
}
132133

133-
// Iterate through all NV chiplets
134+
// Iterate through all OBUS BRICK chiplets
134135
for (auto & l_Target : l_TargetList)
135136
{
136137
// map Targeting Type to fapi2 Type
137-
Target<fapi2::TARGET_TYPE_NV> fapi2_Target( l_Target);
138+
Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_Target( l_Target);
138139
l_chiplet_id = fapi2_Target.getChipletNumber();
139140

140-
FAPI_DBG("testVerifyNvChipletNum HUID: %.8X, ChipletId: %.8X",
141+
FAPI_DBG("testVerifyObusBrickChipletNum HUID: %.8X, ChipletId: %.8X",
141142
TARGETING::get_huid(l_Target), l_chiplet_id);
142143

143-
// NV 0,1 maps to pervasive id 0x05
144-
l_exp_chiplet_id = START_NV_CHIPLET_NUM;
144+
//OBUS Brick's chiplet id should be same as its parent
145+
auto l_parent = static_cast<TARGETING::Target*>
146+
(fapi2_Target.getParent<TARGET_TYPE_OBUS>());
147+
l_chip_unit = l_parent->getAttr<TARGETING::ATTR_CHIP_UNIT>();
148+
l_exp_chiplet_id = l_chip_unit + START_OBUS_BRICK_CHIPLET_NUM;
145149

146150
if (l_chiplet_id != l_exp_chiplet_id)
147151
{
148-
TS_FAIL("testVerifyNvChipletNum: Mismatch - Expected: %.8X:, Found: %.8X",
152+
TS_FAIL("testVerifyObusBrickChipletNum: Mismatch - Expected: %.8X:, Found: %.8X",
149153
l_exp_chiplet_id, l_chiplet_id);
150154
break;
151155
}
152156
}
153157
} while(0);
154-
FAPI_INF("Complete testVerifyNvChipletNum");
158+
FAPI_INF("Complete testVerifyObusBrickChipletNum");
155159
}
156160

157161
void testVerifyPecChipletNum()
@@ -789,7 +793,7 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
789793

790794
testVerifyCappChipletNum();
791795

792-
testVerifyNvChipletNum();
796+
testVerifyObusBrickChipletNum();
793797

794798
testVerifyPecChipletNum();
795799

‎src/usr/fapi2/test/fapi2GetParentTest.H

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -138,8 +138,8 @@ void test_fapi2GetParent()
138138
targeting_targets[MY_XBUS]);
139139
Target<fapi2::TARGET_TYPE_OBUS> fapi2_obusTarget(
140140
targeting_targets[MY_OBUS]);
141-
Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget(
142-
targeting_targets[MY_NV]);
141+
Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_oBrickTarget(
142+
targeting_targets[MY_OBUS_BRICK]);
143143
Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget(
144144
targeting_targets[MY_PPE]);
145145
Target<fapi2::TARGET_TYPE_PERV> fapi2_pervTarget(
@@ -742,31 +742,31 @@ void test_fapi2GetParent()
742742
numFails++;
743743
}
744744

745-
//Check NV's parents
745+
//Check OBUS BRICK's parents
746746
l_tempTargetingParent =
747747
static_cast<TARGETING::Target*>(
748-
fapi2_nvTarget.getParent<TARGET_TYPE_PROC_CHIP>());
748+
fapi2_oBrickTarget.getParent<TARGET_TYPE_PROC_CHIP>());
749749
numTests++;
750750
if(TARGETING::get_huid(l_nimbusProc) !=
751751
TARGETING::get_huid(l_tempTargetingParent))
752752
{
753753
uint8_t l_instance = 0;
754-
targeting_targets[MY_NV]->
754+
targeting_targets[MY_OBUS_BRICK]->
755755
tryGetAttr<TARGETING::ATTR_CHIP_UNIT>(l_instance);
756756
/*@
757757
* @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE
758758
* @moduleid fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST
759-
* @reasoncode fapi2::RC_NV_NO_PROC_FOUND
759+
* @reasoncode fapi2::RC_OBRICK_NO_PROC_FOUND
760760
* @userdata1[0:31] Expected Parent HUID
761761
* @userdata1[32:63] Actual Parent HUID
762-
* @userdata2[0:31] Instance of NV
762+
* @userdata2[0:31] Instance of OBUS BRICK
763763
* @userdata2[32:63] fapi2 Type of expected parent
764764
* @devdesc Could not find the parent PROC of this
765-
* NV target
765+
* OBUS BRICK target
766766
*/
767767
l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
768768
fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST,
769-
fapi2::RC_NV_NO_PROC_FOUND,
769+
fapi2::RC_OBRICK_NO_PROC_FOUND,
770770
TWO_UINT32_TO_UINT64(
771771
TO_UINT32(
772772
TARGETING::get_huid(
@@ -779,7 +779,7 @@ void test_fapi2GetParent()
779779
TO_UINT32(TARGET_TYPE_PROC_CHIP)),
780780
true/*SW Error*/);
781781
errlCommit(l_err,HWPF_COMP_ID);
782-
TS_FAIL( "fapi2TargetTest::Unable to find NV's PROC parent!");
782+
TS_FAIL( "fapi2TargetTest::Unable to find OBUS BRICK's PROC parent!");
783783
numFails++;
784784
}
785785

@@ -987,9 +987,10 @@ void test_fapi2GetParent()
987987
{targeting_targets[MY_OBUS],
988988
[](TARGETING::Target* i_pTarget)
989989
{return getPervasiveParent<TARGET_TYPE_OBUS>(i_pTarget); }},
990-
{targeting_targets[MY_NV],
990+
{targeting_targets[MY_OBUS_BRICK],
991991
[](TARGETING::Target* i_pTarget)
992-
{return getPervasiveParent<TARGET_TYPE_NV>(i_pTarget); }},
992+
{return
993+
getPervasiveParent<TARGET_TYPE_OBUS_BRICK>(i_pTarget);}},
993994
{targeting_targets[MY_CAPP],
994995
[](TARGETING::Target* i_pTarget)
995996
{return getPervasiveParent<TARGET_TYPE_CAPP>(i_pTarget); }},

0 commit comments

Comments
 (0)