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>

2 files changed, 38 insertions, 23 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:
diff --git a/src/usr/fapi2/test/fapi2MvpdTestCxx.H b/src/usr/fapi2/test/fapi2MvpdTestCxx.H
index 9bb030a85..0f0d0e056 100644
--- a/src/usr/fapi2/test/fapi2MvpdTestCxx.H
+++ b/src/usr/fapi2/test/fapi2MvpdTestCxx.H
@@ -367,7 +367,7 @@ public:
               if(*l_bucketAttr != 2)
               {
                   numFails++;
-                  TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 1, not %d",l_huid, voltageData.bucketId);
+                  TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 2, not %d",l_huid, *l_bucketAttr);
               }
 
               if(l_rc)
@@ -379,17 +379,17 @@ public:
               continue;
           }
           numTests++;
-          if(voltageData.bucketId != 1)
+          if(voltageData.bucketId != 3)
           {
               numFails++;
-              TS_FAIL("Error:p9_pm_get_poundv_bucket with EQ with HUID = 0x%X should have returned bucket ID 1, not %d",l_huid, voltageData.bucketId);
+              TS_FAIL("Error:p9_pm_get_poundv_bucket with EQ with HUID = 0x%X should have returned bucket ID 3, not %d",l_huid, voltageData.bucketId);
               continue;
           }
           numTests++;
-          if(*l_bucketAttr != 1)
+          if(*l_bucketAttr != 3)
           {
               numFails++;
-              TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 1, not %d",l_huid, voltageData.bucketId);
+              TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 3, not %d",l_huid, *l_bucketAttr);
           }
 
           if(l_rc)
@@ -464,33 +464,33 @@ public:
               {
                   numFails++;
                   TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDW_BUCKET_DATA "
-                          "EQ with HUID = 0x%X should have bucket ID 1, not %d",
+                          "EQ with HUID = 0x%X should have bucket ID 2, not %d",
                           l_huid,
-                          vdmData.bucketId);
+                          *l_bucketAttr);
               }
 
               continue;
           }
 
           numTests++;
-          if(vdmData.bucketId != 1)
+          if(vdmData.bucketId != 3)
           {
               numFails++;
               TS_FAIL("Error:p9_pm_get_poundw_bucket with EQ with HUID = "
-                      "0x%X should have returned bucket ID 1, not %d",
+                      "0x%X should have returned bucket ID 3, not %d",
                       l_huid,
                       vdmData.bucketId);
               continue;
           }
 
           numTests++;
-          if(*l_bucketAttr != 1)
+          if(*l_bucketAttr != 2)
           {
               numFails++;
-              TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA "
-                      "EQ with HUID = 0x%X should have bucket ID 1, not %d",
+              TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDW_BUCKET_DATA "
+                      "EQ with HUID = 0x%X should have bucket ID 2, not %d",
                       l_huid,
-                      vdmData.bucketId);
+                      *l_bucketAttr);
           }
 
           FAPI_INF("Bucket for HUID: 0x%X is = %d", l_huid, vdmData.bucketId);