diff options
author | Prachi Gupta <pragupta@us.ibm.com> | 2017-03-24 14:17:48 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-05-23 14:02:55 -0400 |
commit | 3d40df249d4ff2f2f6a3c17dcab7d069a355d28a (patch) | |
tree | c4dae42b02565637586d2c254ab8077a3dac1658 /src/usr/fapi2 | |
parent | da1946689af4b765c9ad5c6a7f64cc4f34df252a (diff) | |
download | talos-hostboot-3d40df249d4ff2f2f6a3c17dcab7d069a355d28a.tar.gz talos-hostboot-3d40df249d4ff2f2f6a3c17dcab7d069a355d28a.zip |
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>
Diffstat (limited to 'src/usr/fapi2')
-rw-r--r-- | src/usr/fapi2/plat_attr_override_sync.C | 6 | ||||
-rw-r--r-- | src/usr/fapi2/plat_utils.C | 6 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2GetChildrenTest.H | 8 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2GetChipletNumTest.H | 36 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2GetParentTest.H | 27 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2HwpTest.H | 10 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2IsFunctionalTest.H | 10 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.C | 46 | ||||
-rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.H | 51 | ||||
-rw-r--r-- | src/usr/fapi2/test/p9_sample_procedure.C | 10 | ||||
-rw-r--r-- | src/usr/fapi2/test/p9_sample_procedure.H | 6 |
11 files changed, 109 insertions, 107 deletions
diff --git a/src/usr/fapi2/plat_attr_override_sync.C b/src/usr/fapi2/plat_attr_override_sync.C index b6775e274..d16324f47 100644 --- a/src/usr/fapi2/plat_attr_override_sync.C +++ b/src/usr/fapi2/plat_attr_override_sync.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -150,8 +150,8 @@ void directOverride() case fapi2::TARGET_TYPE_OBUS: l_targetType = TARGETING::TYPE_OBUS; break; - case fapi2::TARGET_TYPE_NV: - l_targetType = TARGETING::TYPE_NV; + case fapi2::TARGET_TYPE_OBUS_BRICK: + l_targetType = TARGETING::TYPE_OBUS_BRICK; break; case fapi2::TARGET_TYPE_SBE: l_targetType = TARGETING::TYPE_SBE; diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index efc23bdb1..fb63fc3f2 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -308,9 +308,9 @@ void xlateTargetType(const fapi2::TargetType i_targetType, o_class = TARGETING::CLASS_UNIT; o_type = TARGETING::TYPE_OBUS; break; - case fapi2::TARGET_TYPE_NV: + case fapi2::TARGET_TYPE_OBUS_BRICK: o_class = TARGETING::CLASS_UNIT; - o_type = TARGETING::TYPE_NV; + o_type = TARGETING::TYPE_OBUS_BRICK; break; case fapi2::TARGET_TYPE_SBE: o_class = TARGETING::CLASS_UNIT; @@ -361,7 +361,7 @@ bool isPhysParentChild(const TargetType i_parentType, TARGET_TYPE_CAPP | TARGET_TYPE_DMI | TARGET_TYPE_OBUS | - TARGET_TYPE_NV | + TARGET_TYPE_OBUS_BRICK | TARGET_TYPE_SBE | TARGET_TYPE_PPE | TARGET_TYPE_PERV | diff --git a/src/usr/fapi2/test/fapi2GetChildrenTest.H b/src/usr/fapi2/test/fapi2GetChildrenTest.H index 8fd90c851..946983338 100644 --- a/src/usr/fapi2/test/fapi2GetChildrenTest.H +++ b/src/usr/fapi2/test/fapi2GetChildrenTest.H @@ -304,12 +304,12 @@ void test_fapi2GetChildren() { return i_perv.getChildren<fapi2::TARGET_TYPE_CAPP>( TARGET_STATE_PRESENT).size(); } }, - // NV pervasive has 1 NV children - {PERV_NV_CHILDREN, + // OBUS pervasive has 3 OBUS BRICK children + {PERV_OBUS_BRICK_CHILDREN, [](TARGETING::ATTR_CHIP_UNIT_type i_unit) - { return (i_unit == NV_RANGE); }, + { return ((i_unit >= OBUS_LOW) && (i_unit <= OBUS_HIGH)); }, [](Target<fapi2::TARGET_TYPE_PERV>& i_perv) - { return i_perv.getChildren<fapi2::TARGET_TYPE_NV>( + { return i_perv.getChildren<fapi2::TARGET_TYPE_OBUS_BRICK>( TARGET_STATE_PRESENT).size(); } }, // MCBIST/MCS/MCA pervasive has 1 MCBIST child diff --git a/src/usr/fapi2/test/fapi2GetChipletNumTest.H b/src/usr/fapi2/test/fapi2GetChipletNumTest.H index 01c65c0bc..1057c076a 100644 --- a/src/usr/fapi2/test/fapi2GetChipletNumTest.H +++ b/src/usr/fapi2/test/fapi2GetChipletNumTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -104,54 +104,58 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite FAPI_INF("Complete testVerifyiPhbChipletNum"); } - void testVerifyNvChipletNum() + void testVerifyObusBrickChipletNum() { uint8_t l_chiplet_id = 0; uint8_t l_exp_chiplet_id = 0; + uint8_t l_chip_unit = 0; - FAPI_INF ("Start testVerifyNvChipletNum"); + FAPI_INF ("Start testVerifyObusBrickChipletNum"); do { - // find the all NV units + // find the all OBUS Brick units TARGETING::Target * pSys; TARGETING::targetService().getTopLevelTarget(pSys); - TARGETING::PredicateCTM predNv(TARGETING::CLASS_UNIT, - TARGETING::TYPE_NV); + TARGETING::PredicateCTM predObusBrick(TARGETING::CLASS_UNIT, + TARGETING::TYPE_OBUS_BRICK); TARGETING::TargetHandleList l_TargetList; TARGETING::targetService().getAssociated( l_TargetList, pSys, TARGETING::TargetService::CHILD, TARGETING::TargetService::ALL, - &predNv); + &predObusBrick); if (l_TargetList.empty()) { - TS_FAIL("testVerifyNvChipletNum: empty l_TargetList"); + TS_FAIL("testVerifyObusBrickChipletNum: empty l_TargetList"); break; } - // Iterate through all NV chiplets + // Iterate through all OBUS BRICK chiplets for (auto & l_Target : l_TargetList) { // map Targeting Type to fapi2 Type - Target<fapi2::TARGET_TYPE_NV> fapi2_Target( l_Target); + Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_Target( l_Target); l_chiplet_id = fapi2_Target.getChipletNumber(); - FAPI_DBG("testVerifyNvChipletNum HUID: %.8X, ChipletId: %.8X", + FAPI_DBG("testVerifyObusBrickChipletNum HUID: %.8X, ChipletId: %.8X", TARGETING::get_huid(l_Target), l_chiplet_id); - // NV 0,1 maps to pervasive id 0x05 - l_exp_chiplet_id = START_NV_CHIPLET_NUM; + //OBUS Brick's chiplet id should be same as its parent + auto l_parent = static_cast<TARGETING::Target*> + (fapi2_Target.getParent<TARGET_TYPE_OBUS>()); + l_chip_unit = l_parent->getAttr<TARGETING::ATTR_CHIP_UNIT>(); + l_exp_chiplet_id = l_chip_unit + START_OBUS_BRICK_CHIPLET_NUM; if (l_chiplet_id != l_exp_chiplet_id) { - TS_FAIL("testVerifyNvChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", + TS_FAIL("testVerifyObusBrickChipletNum: Mismatch - Expected: %.8X:, Found: %.8X", l_exp_chiplet_id, l_chiplet_id); break; } } } while(0); - FAPI_INF("Complete testVerifyNvChipletNum"); + FAPI_INF("Complete testVerifyObusBrickChipletNum"); } void testVerifyPecChipletNum() @@ -789,7 +793,7 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite testVerifyCappChipletNum(); - testVerifyNvChipletNum(); + testVerifyObusBrickChipletNum(); testVerifyPecChipletNum(); diff --git a/src/usr/fapi2/test/fapi2GetParentTest.H b/src/usr/fapi2/test/fapi2GetParentTest.H index 332768c6e..dedd3ee08 100644 --- a/src/usr/fapi2/test/fapi2GetParentTest.H +++ b/src/usr/fapi2/test/fapi2GetParentTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -138,8 +138,8 @@ void test_fapi2GetParent() targeting_targets[MY_XBUS]); Target<fapi2::TARGET_TYPE_OBUS> fapi2_obusTarget( targeting_targets[MY_OBUS]); - Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget( - targeting_targets[MY_NV]); + Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_oBrickTarget( + targeting_targets[MY_OBUS_BRICK]); Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget( targeting_targets[MY_PPE]); Target<fapi2::TARGET_TYPE_PERV> fapi2_pervTarget( @@ -742,31 +742,31 @@ void test_fapi2GetParent() numFails++; } - //Check NV's parents + //Check OBUS BRICK's parents l_tempTargetingParent = static_cast<TARGETING::Target*>( - fapi2_nvTarget.getParent<TARGET_TYPE_PROC_CHIP>()); + fapi2_oBrickTarget.getParent<TARGET_TYPE_PROC_CHIP>()); numTests++; if(TARGETING::get_huid(l_nimbusProc) != TARGETING::get_huid(l_tempTargetingParent)) { uint8_t l_instance = 0; - targeting_targets[MY_NV]-> + targeting_targets[MY_OBUS_BRICK]-> tryGetAttr<TARGETING::ATTR_CHIP_UNIT>(l_instance); /*@ * @errortype ERRORLOG::ERRL_SEV_UNRECOVERABLE * @moduleid fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST - * @reasoncode fapi2::RC_NV_NO_PROC_FOUND + * @reasoncode fapi2::RC_OBRICK_NO_PROC_FOUND * @userdata1[0:31] Expected Parent HUID * @userdata1[32:63] Actual Parent HUID - * @userdata2[0:31] Instance of NV + * @userdata2[0:31] Instance of OBUS BRICK * @userdata2[32:63] fapi2 Type of expected parent * @devdesc Could not find the parent PROC of this - * NV target + * OBUS BRICK target */ l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE, fapi2::MOD_FAPI2_PLAT_GET_PARENT_TEST, - fapi2::RC_NV_NO_PROC_FOUND, + fapi2::RC_OBRICK_NO_PROC_FOUND, TWO_UINT32_TO_UINT64( TO_UINT32( TARGETING::get_huid( @@ -779,7 +779,7 @@ void test_fapi2GetParent() TO_UINT32(TARGET_TYPE_PROC_CHIP)), true/*SW Error*/); errlCommit(l_err,HWPF_COMP_ID); - TS_FAIL( "fapi2TargetTest::Unable to find NV's PROC parent!"); + TS_FAIL( "fapi2TargetTest::Unable to find OBUS BRICK's PROC parent!"); numFails++; } @@ -987,9 +987,10 @@ void test_fapi2GetParent() {targeting_targets[MY_OBUS], [](TARGETING::Target* i_pTarget) {return getPervasiveParent<TARGET_TYPE_OBUS>(i_pTarget); }}, - {targeting_targets[MY_NV], + {targeting_targets[MY_OBUS_BRICK], [](TARGETING::Target* i_pTarget) - {return getPervasiveParent<TARGET_TYPE_NV>(i_pTarget); }}, + {return + getPervasiveParent<TARGET_TYPE_OBUS_BRICK>(i_pTarget);}}, {targeting_targets[MY_CAPP], [](TARGETING::Target* i_pTarget) {return getPervasiveParent<TARGET_TYPE_CAPP>(i_pTarget); }}, diff --git a/src/usr/fapi2/test/fapi2HwpTest.H b/src/usr/fapi2/test/fapi2HwpTest.H index 620325b3b..c6a1bbc71 100644 --- a/src/usr/fapi2/test/fapi2HwpTest.H +++ b/src/usr/fapi2/test/fapi2HwpTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -134,8 +134,8 @@ void test_fapi2Hwp() targeting_targets[MY_XBUS]); fapi2::Target<fapi2::TARGET_TYPE_OBUS> fapi2_obusTarget( targeting_targets[MY_OBUS]); - fapi2::Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget( - targeting_targets[MY_NV]); + fapi2::Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_oBrickTarget( + targeting_targets[MY_OBUS_BRICK]); fapi2::Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget(targeting_targets[MY_PPE]); fapi2::Target<fapi2::TARGET_TYPE_PERV> fapi2_pervTarget( targeting_targets[MY_PERV]); @@ -247,13 +247,13 @@ void test_fapi2Hwp() TS_FAIL("Error occured in p9_sample_procedure_obus !!"); } numTests++; - FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_nv, fapi2_nvTarget, scratchWriteValue); + FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_obrick, fapi2_oBrickTarget, scratchWriteValue); if(l_errl != NULL) { delete l_errl; l_errl = NULL; numFails++; - TS_FAIL("Error occured in p9_sample_procedure_nv !!"); + TS_FAIL("Error occured in p9_sample_procedure_obrick !!"); } numTests++; FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_ppe, fapi2_ppeTarget, scratchWriteValue); diff --git a/src/usr/fapi2/test/fapi2IsFunctionalTest.H b/src/usr/fapi2/test/fapi2IsFunctionalTest.H index b363f3002..e6fddc64f 100644 --- a/src/usr/fapi2/test/fapi2IsFunctionalTest.H +++ b/src/usr/fapi2/test/fapi2IsFunctionalTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -129,10 +129,10 @@ class Fapi2IsFunctional : public CxxTest::TestSuite targetList[MY_OBUS]); fapiTargetList[MY_OBUS] = fapi2_obusTarget; - // NV - Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget( - targetList[MY_NV]); - fapiTargetList[MY_NV] = fapi2_nvTarget; + // OBUS_BRICK + Target<fapi2::TARGET_TYPE_OBUS_BRICK> fapi2_oBrickTarget( + targetList[MY_OBUS_BRICK]); + fapiTargetList[MY_OBUS_BRICK] = fapi2_oBrickTarget; // PPE Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget( diff --git a/src/usr/fapi2/test/fapi2TestUtils.C b/src/usr/fapi2/test/fapi2TestUtils.C index c3221993c..406b3a0d4 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.C +++ b/src/usr/fapi2/test/fapi2TestUtils.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -36,18 +36,16 @@ //This is subject to change, try to keep updated #define NUM_EQS 6 -#define NUM_EXS 12 -#define NUM_CORES 24 -#define NUM_L2S 12 -#define NUM_L3S 12 -#define NUM_MCS 4 -#define NUM_MCAS 8 +#define NUM_EXS 2 +#define NUM_CORES 2 +#define NUM_MCS 2 +#define NUM_MCAS 2 #define NUM_MCBISTS 2 #define NUM_PECS 3 #define NUM_PHBS 6 #define NUM_XBUS 2 #define NUM_OBUS 2 -#define NUM_NV 2 +#define NUM_OBUS_BRICK 3 #define NUM_PPES 21 #define NUM_PERVS 55 #define NUM_CAPPS 2 @@ -206,6 +204,7 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, } } + //Setup OBUSs i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); for(int i = 0; i < NUM_OBUS; i+=3) @@ -215,23 +214,21 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, { o_targetList[MY_OBUS] = TARGETING::targetService().toTarget(l_epath); - break; - } - else - { - l_epath.removeLast(); - } - } - //Setup NV - i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); - for(int i = 0; i < NUM_NV; i++) - { - l_epath.addLast(TARGETING::TYPE_NV, i); - if(TARGETING::targetService().toTarget(l_epath) != NULL) - { - o_targetList[MY_NV] = - TARGETING::targetService().toTarget(l_epath); + for (int j = 0; j < NUM_OBUS_BRICK; j++) + { + l_epath.addLast(TARGETING::TYPE_OBUS_BRICK, j); + if (TARGETING::targetService().toTarget(l_epath) != NULL) + { + o_targetList[MY_OBUS_BRICK] = + TARGETING::targetService().toTarget(l_epath); + break; + } + else + { + l_epath.removeLast(); + } + } break; } else @@ -240,6 +237,7 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, } } + //Setup PPEs i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath); for(int i = 0; i < NUM_PPES; i++) diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H index 937af56f3..d435c277a 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.H +++ b/src/usr/fapi2/test/fapi2TestUtils.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -47,21 +47,21 @@ #define SIMULATED_GOOD_CORES 4 // non-core and non-cache chiplet ids -#define START_PERV_CHIPLET_NUM 0x01 +#define START_PERV_CHIPLET_NUM 0x01 // CAPI Unit(0,1 => 0x02, 0x04) -#define START_CAPP_CHIPLET_NUM 0x02 -// NV (0, 1 => 0x05) -#define START_NV_CHIPLET_NUM 0x05 +#define START_CAPP_CHIPLET_NUM 0x02 +// OBUS BRICK ({0-2}, {9,11} => 0x09, 0xC) +#define START_OBUS_BRICK_CHIPLET_NUM 0x09 // XBUS (0, 1 => 0x6) -#define START_XBUS_CHIPLET_NUM 0x06 +#define START_XBUS_CHIPLET_NUM 0x06 // MCBIST (0, 1 => 0x07, 0x08) -#define START_MCBIST_CHIPLET_NUM 0x07 +#define START_MCBIST_CHIPLET_NUM 0x07 // OBUS (0, 3 => 0x09, 0x0C) -#define START_OBUS_CHIPLET_NUM 0x09 +#define START_OBUS_CHIPLET_NUM 0x09 // PEC (0, 1, 2 => 0x0D, 0x0E, 0x0F) -#define START_PEC_0_CHIPLET_NUM 0x0D -#define START_PEC_1_CHIPLET_NUM 0x0E -#define START_PEC_2_CHIPLET_NUM 0x0F +#define START_PEC_0_CHIPLET_NUM 0x0D +#define START_PEC_1_CHIPLET_NUM 0x0E +#define START_PEC_2_CHIPLET_NUM 0x0F // All Cache Chiplets #define START_EQ_CHIPLET_NUM 0x10 @@ -87,7 +87,7 @@ enum{ MY_PHB, MY_XBUS, MY_OBUS, - MY_NV, + MY_OBUS_BRICK, MY_PPE, MY_PERV, MY_CAPP, @@ -99,19 +99,19 @@ enum{ * @brief Number of children of given type that applicable pervasive has */ enum PERVASIVE_CHILDREN { - PERV_EQ_CHILDREN = 1, - PERV_CORE_CHILDREN = 1, - PERV_XBUS_CHILDREN = 2, - PERV_OBUS_CHILDREN = 1, - PERV_CAPP_CHILDREN = 1, - PERV_NV_CHILDREN = 2, - PERV_MCBIST_CHILDREN = 1, - PERV_MCS_CHILDREN = 2, - PERV_MCA_CHILDREN = 4, - PERV_PEC_CHILDREN = 1, - PERV_PEC0_PHB_CHILDREN = 1, - PERV_PEC1_PHB_CHILDREN = 2, - PERV_PEC2_PHB_CHILDREN = 3, + PERV_EQ_CHILDREN = 1, + PERV_CORE_CHILDREN = 1, + PERV_XBUS_CHILDREN = 2, + PERV_OBUS_CHILDREN = 1, + PERV_CAPP_CHILDREN = 1, + PERV_OBUS_BRICK_CHILDREN = 3, + PERV_MCBIST_CHILDREN = 1, + PERV_MCS_CHILDREN = 2, + PERV_MCA_CHILDREN = 4, + PERV_PEC_CHILDREN = 1, + PERV_PEC0_PHB_CHILDREN = 1, + PERV_PEC1_PHB_CHILDREN = 2, + PERV_PEC2_PHB_CHILDREN = 3, }; /** @@ -132,7 +132,6 @@ enum PERVASIVE_RANGE { OBUS_HIGH = 12, CAPP0_RANGE = 2, CAPP1_RANGE = 4, - NV_RANGE = 5, MC_LOW = 7, MC_HIGH = 8, PEC_LOW = 13, diff --git a/src/usr/fapi2/test/p9_sample_procedure.C b/src/usr/fapi2/test/p9_sample_procedure.C index 1d4cf32e9..57ef2309e 100644 --- a/src/usr/fapi2/test/p9_sample_procedure.C +++ b/src/usr/fapi2/test/p9_sample_procedure.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -258,17 +258,17 @@ fapi_try_exit: } -fapi2::ReturnCode p9_sample_procedure_nv( - fapi2::Target<fapi2::TARGET_TYPE_NV>& i_target, +fapi2::ReturnCode p9_sample_procedure_obrick( + fapi2::Target<fapi2::TARGET_TYPE_OBUS_BRICK>& i_target, uint8_t expectedValue) { uint8_t l_attr_scratch = 0; FAPI_ERR("Entering ..."); - FAPI_ERR("Set Scratch Attr on NV Target"); + FAPI_ERR("Set Scratch Attr on OBUS BRICK Target"); FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_SCRATCH_UINT8_1, i_target, expectedValue)); - FAPI_ERR("Get Scratch Attr on NV Target"); + FAPI_ERR("Get Scratch Attr on OBUS BRICK Target"); FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_SCRATCH_UINT8_1, i_target, l_attr_scratch)); FAPI_ERR("Read scratch value : %d , expected it to be %d", l_attr_scratch, expectedValue); diff --git a/src/usr/fapi2/test/p9_sample_procedure.H b/src/usr/fapi2/test/p9_sample_procedure.H index e931e7624..2903e285f 100644 --- a/src/usr/fapi2/test/p9_sample_procedure.H +++ b/src/usr/fapi2/test/p9_sample_procedure.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -89,8 +89,8 @@ fapi2::ReturnCode p9_sample_procedure_obus( fapi2::Target<fapi2::TARGET_TYPE_OBUS>& i_target, uint8_t expectedValue); -fapi2::ReturnCode p9_sample_procedure_nv( - fapi2::Target<fapi2::TARGET_TYPE_NV>& i_target, +fapi2::ReturnCode p9_sample_procedure_obrick( + fapi2::Target<fapi2::TARGET_TYPE_OBUS_BRICK>& i_target, uint8_t expectedValue); fapi2::ReturnCode p9_sample_procedure_sbe( |