diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2017-09-18 13:49:09 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-11-01 15:34:36 -0400 |
| commit | 08d89ba2b8784fc69abc051a1d905a770405b6b9 (patch) | |
| tree | 11564bf8944d35af5a9d6a120da41ae1790ca181 /src/usr/fapi2/test/fapi2ChipEcTest.H | |
| parent | 7f4fb82f60a51dc3742e11022867114b76cfb41d (diff) | |
| download | talos-hostboot-08d89ba2b8784fc69abc051a1d905a770405b6b9.tar.gz talos-hostboot-08d89ba2b8784fc69abc051a1d905a770405b6b9.zip | |
Remove support for P9N (Nimbus) DD1.0
- Will error out during IPL
- Gracefully handle removal of DD1.0 inits,
tied to hw091517b.910 HCODE image
Change-Id: I7b4c53b38863a8251a8c02d7df83a3ff713f52d7
CMVC-Prereq: 1034628
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46356
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2/test/fapi2ChipEcTest.H')
| -rw-r--r-- | src/usr/fapi2/test/fapi2ChipEcTest.H | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/src/usr/fapi2/test/fapi2ChipEcTest.H b/src/usr/fapi2/test/fapi2ChipEcTest.H index 69ea686c9..4c329df42 100644 --- a/src/usr/fapi2/test/fapi2ChipEcTest.H +++ b/src/usr/fapi2/test/fapi2ChipEcTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -91,23 +91,38 @@ class Fapi2ChipEcTest : public CxxTest::TestSuite l_chipList[0]); ATTR_CHIP_EC_FEATURE_TEST2_Type l_valChipEcTest2 = 0; - + FAPI_TRY(FAPI_ATTR_GET(ATTR_CHIP_EC_FEATURE_TEST2, l_fapi2_procTarget, l_valChipEcTest2)); - // Returns if a chip contains the TEST2 feature. True if: - // Nimbus EC less than 2.0 - if(l_valChipEcTest2) - { - FAPI_INF("Pass: This proc is Nimbus and less then DD2.0"); - } - else if(TARGETING::MODEL_NIMBUS != + + // Tests if a chip contains the TEST2 feature. + // True if: Nimbus EC less than 2.0 + if(TARGETING::MODEL_NIMBUS != l_chipList[0]->getAttr<TARGETING::ATTR_MODEL>()) { FAPI_INF("Pass: This proc is not Nimbus so does not have TEST2 feature"); } + else if(l_valChipEcTest2) + { + if(l_chipList[0]->getAttr<TARGETING::ATTR_EC>() < 0x20) + { + FAPI_INF("Pass: This Nimbus proc has TEST2 enabled and < DD2.0"); + } + else + { + TS_FAIL("Fail: This Nimbus proc has TEST2 enabled but >= DD2.0"); + } + } else { - TS_FAIL("Fail: this proc is a nimbus but has DD 2.0 or greater"); + if(l_chipList[0]->getAttr<TARGETING::ATTR_EC>() >= 0x20) + { + FAPI_INF("Pass: This Nimbus proc has TEST2 disabled and >= DD2.0"); + } + else + { + TS_FAIL("Fail: This Nimbus proc has TEST2 disabled but < DD 2.0"); + } } fapi_try_exit: |
