Use Cumulus DD1.3 SBE image instead of DD1.0

Adding support for Cumulus DD1.3 SBE images in the FSP PNOR
Dropping support for Cumulus DD1.0 SBE image from FSP PNOR

CMVC-Prereq: 1060757
CMVC-Prereq: 1063108
CMVC-Prereq: 1061378
Change-Id: Ia315c6f786ef6c522acf4e580ad435b0180513b3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62636
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: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 73 insertions, 29 deletions

diff --git a/src/usr/fapi2/test/fapi2GetChipletNumTest.H b/src/usr/fapi2/test/fapi2GetChipletNumTest.H
index ce50757d9..9c813f377 100644
--- a/src/usr/fapi2/test/fapi2GetChipletNumTest.H
+++ b/src/usr/fapi2/test/fapi2GetChipletNumTest.H
@@ -98,7 +98,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyiPhbChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -153,7 +152,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyObusBrickChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -206,7 +204,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyPecChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -266,7 +263,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyCappChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -326,7 +322,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyMcbistChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -395,7 +390,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyMcsChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -455,7 +449,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyMcaChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -508,16 +501,15 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                 FAPI_DBG("testVerifyMcChipletNum HUID: %.8X, ChipletId: %.8X",
                     TARGETING::get_huid(l_Target), l_chiplet_id);
 
-                // MC 0,1 maps to pervasive ids 0x07
+                // MC 0,1 maps to pervasive ids 0x07,0x08
                 l_chip_unit = l_Target->getAttr<TARGETING::ATTR_CHIP_UNIT>();
-                l_exp_chiplet_id = l_chip_unit / 4 + START_MC_CHIPLET_NUM;
+                l_exp_chiplet_id = l_chip_unit + START_MC_CHIPLET_NUM;
 
                 if (l_chiplet_id != l_exp_chiplet_id)
                 {
                     TS_FAIL("testVerifyMcChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
 
@@ -572,15 +564,15 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TARGETING::get_huid(l_Target), l_chiplet_id);
 
                 // MI 0,1  maps to pervasive ids 0x07
+                // MI 2,3  maps to pervasive ids 0x08
                 l_chip_unit = l_Target->getAttr<TARGETING::ATTR_CHIP_UNIT>();
-                l_exp_chiplet_id = l_chip_unit / 4 + START_MI_CHIPLET_NUM;
+                l_exp_chiplet_id = l_chip_unit / 2 + START_MI_CHIPLET_NUM;
 
                 if (l_chiplet_id != l_exp_chiplet_id)
                 {
                     TS_FAIL("testVerifyMiChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
 
@@ -644,7 +636,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_INFO("testVerifyDmiChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
 
@@ -712,7 +703,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyObusChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -761,7 +751,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyXbusChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             START_XBUS_CHIPLET_NUM, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -812,7 +801,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyPervChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_chip_unit, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -866,7 +854,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyEQChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -928,7 +915,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyEXChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
@@ -983,7 +969,6 @@ class Fapi2GetChipletNum : public CxxTest::TestSuite
                     TS_FAIL("testVerifyCoreChipletNum: Mismatch HUID %.8X - Expected: %.8X:, Found: %.8X",
                             TARGETING::get_huid(l_Target),
                             l_exp_chiplet_id, l_chiplet_id);
-                    break;
                 }
             }
         } while(0);
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
index cc7147c48..0bc77fb14 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
@@ -128,6 +128,12 @@
         <default>0xFFFF</default>
     </attribute>
 
+    <!-- This should be irrelevant but it affects what nest freq we run -->
+    <attribute>
+        <id>REQUIRED_SYNCH_MODE</id>
+        <default>1</default>
+    </attribute>
+
     <attribute>
         <id>O_EREPAIR_THRESHOLD_FIELD</id>
         <default>1</default>
@@ -6233,7 +6239,7 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x07</default>
+        <default>0x08</default>
     </attribute>
     <attribute>
         <id>CLASS</id>
@@ -6459,7 +6465,7 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x07</default>
+        <default>0x08</default>
     </attribute>
     <attribute>
         <id>CLASS</id>
@@ -6531,7 +6537,7 @@
     </attribute>
     <attribute>
         <id>CHIPLET_ID</id>
-        <default>0x07</default>
+        <default>0x08</default>
     </attribute>
     <attribute>
         <id>CLASS</id>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
index 287ab72e1..2cff7a108 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml
@@ -3307,6 +3307,10 @@
         <default>0</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3387,6 +3391,10 @@
         <default>1</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3466,6 +3474,10 @@
         <default>2</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3545,6 +3557,10 @@
         <default>3</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3610,6 +3626,8 @@
         <default>DMI</default>
     </attribute>
 </targetInstance>
+
+
 <targetInstance>
     <id>sys0node0proc0mc1mi2dmi4</id>
     <type>unit-dmi-cumulus</type>
@@ -3624,6 +3642,10 @@
         <default>4</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3703,6 +3725,10 @@
         <default>5</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3782,6 +3808,10 @@
         <default>6</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -3861,6 +3891,10 @@
         <default>7</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -5352,6 +5386,10 @@
         <default>0</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -6194,6 +6232,10 @@
         <default>1</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -6272,6 +6314,10 @@
         <default>0</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -6340,6 +6386,10 @@
         <default>1</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x07</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -6408,6 +6458,10 @@
         <default>2</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
@@ -6476,6 +6530,10 @@
         <default>3</default>
     </attribute>
     <attribute>
+        <id>CHIPLET_ID</id>
+        <default>0x08</default>
+    </attribute>
+    <attribute>
         <id>CLASS</id>
         <default>UNIT</default>
     </attribute>
diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile
index 293cb3045..e74cfa2cd 100644
--- a/src/usr/vpd/makefile
+++ b/src/usr/vpd/makefile
@@ -47,14 +47,9 @@ BINARY_FILES += $(IMGDIR)/procmvpd_ven.dat:dd8507bec946283260f82af212ed32feaeb33
 BINARY_FILES += $(IMGDIR)/vpo_sysmvpd.dat:f83bbcdd56defb5d155399774c4d721de25a8e96
 BINARY_FILES += $(IMGDIR)/vpo_djvpd.dat:eb4dce98f19ebfe77243be1c56d3d0eaa1889d90
 
-# Nimbus Module VPD
-# Copied from /afs/btv.ibm.com/u/sgrom/public/vpd_images/p9_dd10/module-p9-dd10-simics_v15_rs4v2.bin
-#   on 1/3/2017
-# Modified PG record to have proper XBUS data and only the first 4 cores
+# P9 Module VPD
 BINARY_FILES += $(IMGDIR)/procmvpd_p9n.dat:a351f3cd5ba8a81a50c3e5a0dea5fea03e55769d
-BINARY_FILES += $(IMGDIR)/procmvpd_p9c.dat:d9299c4027c597c31337b46ed311edc131ec93bc
-
-#Update to Centaur DD2.0 for CCIN 31E8
+BINARY_FILES += $(IMGDIR)/procmvpd_p9c.dat:939f91a9359b917c525dd7cd4ea80a03b1c08714
 
 # CDIMM Format - download 4k cvpd file
 BINARY_FILES += $(IMGDIR)/cvpd_cdimm.dat:b12431fbc14304edd31e74405cdcb27560a8e00b