Enable VPD population for Cumulus Simulation

Change-Id: I45bd9b557ad21c64728531e88ab029b8bfdeb54d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43432
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: SWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>
Reviewed-by: Sakethan R. Kotta <sakkotta@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 27 insertions, 5 deletions

diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 90c2aab35..76b8c0aed 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -39,3 +39,8 @@ cd $sb/sbei/sbfw/
 mk -a && mk install_all
 cd -
 
+#changes needed for Cumulus
+echo "Applying SIMICS workaround to support Cumulus"
+sbex -t 1031560
+cd $sb/simu
+mk -a
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 4b5dc3b25..170612fd4 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -230,6 +230,7 @@ simics.tar_CONTENTS = \
     img/procmvpd.dat \
     img/procmvpd_ven.dat \
     img/procmvpd_p9n.dat \
+    img/procmvpd_p9c.dat \
     img/cvpd.dat \
     img/dvpd.dat \
     obj/genfiles/attrInfo.csv \
diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl
index 70fc244a7..72717fa94 100755
--- a/src/build/simics/hb-pnor-vpd-preload.pl
+++ b/src/build/simics/hb-pnor-vpd-preload.pl
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -57,6 +57,7 @@ my $emptyMemVPD;
 my $mvpdFile = "procmvpd.dat";
 my $mvpdFile_ven = "procmvpd_ven.dat";
 my $mvpdFile_p9n = "procmvpd_p9n.dat";
+my $mvpdFile_p9c = "procmvpd_p9c.dat";
 my $cvpdFile = "cvpd.dat";
 my $dvpdFile = "dvpd.dat";
 my $memVpdFile = $cvpdFile;
@@ -302,6 +303,10 @@ sub createMVPDData
             {
                 $sourceFile = "$dataPath/$mvpdFile_p9n";
             }
+            elsif( $procChipType eq "p9c")
+            {
+                $sourceFile = "$dataPath/$mvpdFile_p9c";
+            }
             else
             {
                 $sourceFile = "$dataPath/$mvpdFile";
@@ -503,7 +508,7 @@ sub getMemoryConfig
         #use pre-defined Centaur Plugging order
         for( my $mcs = 0; $mcs < $MAX_MCS; $mcs++ )
         {
-            debugMsg( "Mcs: $mcs" );
+            debugMsg( "Mcs: $mcs CentPerProc: $numCentPerProc" );
             if( $machine eq "MURANO" || $machine eq "NO_SP")
             {
                 # Plugging order is:
@@ -551,6 +556,16 @@ sub getMemoryConfig
                     }
                 }
             }
+            elsif( $machine eq "CUMULUS" )
+            {
+                # Plugging order is:
+                #   Processor 0 - 3
+                #   MCS 0 - 3 (1 Centaur/MCS)
+                if(($mcs % $MAX_MCS) >= 0 && ($mcs % $MAX_MCS) < 4)
+                {
+                    $mcsArray[$mcs] = 1;
+                }
+            }
             elsif( $procChipType eq "p9n")
             {
             #There are no centaurs within a NIMBUS machine, but need to set
diff --git a/src/build/simics/hb-pnor-vpd-preload.py b/src/build/simics/hb-pnor-vpd-preload.py
index 49d97e2a2..1c2ce6a0d 100755
--- a/src/build/simics/hb-pnor-vpd-preload.py
+++ b/src/build/simics/hb-pnor-vpd-preload.py
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -32,10 +32,11 @@ import shlex
 toolLoc = os.environ.get("HB_TOOLPATH");
 thisSys = os.environ.get("HB_MACHINE").upper();
 numProcs = os.environ.get( "NUM_PROCS");
+dimmsPerProc = os.environ.get( "DIMMS_PER_PROC");
 numCentaurPerProcParm = "";
 numCentaurPerProc = "0";
-if os.environ.has_key( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys ):
-    numCentaurPerProc=os.environ.get( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys );
+if (thisSys == "CUMULUS"):
+    numCentaurPerProc=str(int(dimmsPerProc)/2);
     numCentaurPerProcParm=" --numCentPerProc " + numCentaurPerProc;
 pass
 procChipTypeParm = "";