Updates to standalone vpd support for Nimbus config

Generated mvpd dat file containing records used for simics
to run the nimbus model

Change-Id: If2a2a9c9e325f11d59c845f92b3f338025f3564f
RTC:127341
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18658
Tested-by: Jenkins Server
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 31 insertions, 31 deletions

diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl
index eaaea3f1b..9289baf26 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,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -32,7 +32,7 @@ my $numProcs;
 my $numCentPerProc;
 my $dataPath = ".";
 my $outputPath = ".";
-my $machine = "MURANO";
+my $machine = "NIMBUS";
 my $procConfig = "uninit";
 my $centConfig = "uninit";
 my $maxProcs = 8;
@@ -54,6 +54,7 @@ my $emptyCVPD;
 
 my $mvpdFile = "procmvpd.dat";
 my $mvpdFile_ven = "procmvpd_ven.dat";
+my $mvpdFile_p9n = "procmvpd_p9n.dat";
 my $cvpdFile = "cvpd.dat";
 my $spdFile = "dimmspd.dat";
 my $sysMVPD = "sysmvpd.dat";
@@ -216,7 +217,7 @@ sub examples
     print "   --dataPath <path to input dat files>\n";
     print "\n";
     print "Create a VPO image with explicit Proc and Centaur plugging\n";
-    print "   This will result in VPD for the first to proc and Centuars\n";
+    print "   This will result in VPD for the first to proc and Centaurs\n";
     print "   behind MCS0 and MCS1 on each processor\n";
     print "   NOTE: for VPO, maxProcs must be set to 4\n";
     print "$0 --maxProcs 4 --forceProc 1100 --forceCent 11000000";
@@ -285,6 +286,10 @@ sub createMVPDData
             {
                 $sourceFile = "$dataPath/$mvpdFile_ven";
             }
+            elsif( $machine eq "NIMBUS")
+            {
+                $sourceFile = "$dataPath/$mvpdFile_p9n";
+            }
             else
             {
                 $sourceFile = "$dataPath/$mvpdFile";
@@ -513,6 +518,11 @@ sub getCentaurConfig
                     }
                 }
             }
+            elsif( $machine eq "NIMBUS")
+            {
+            #as there are no centaurs within a NIMBUS machine NO configuration
+            #for centaur chips is required 
+            }
             else
             {
                 die "Invalid machine ($machine)!!!  Cannot preload DIMM VPD data...exiting.";
diff --git a/src/build/simics/hb-pnor-vpd-preload.py b/src/build/simics/hb-pnor-vpd-preload.py
index bb512fcc2..02cd9f82e 100755
--- a/src/build/simics/hb-pnor-vpd-preload.py
+++ b/src/build/simics/hb-pnor-vpd-preload.py
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2015
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,8 +31,8 @@ import shlex
 #------------------------------------------------------------------------------
 toolLoc = os.environ.get("HB_TOOLPATH");
 thisSys = os.environ.get("HB_MACHINE").upper();
-numProcs = os.environ.get( "GFW_P8_%s_NUM_PROCS" % thisSys );
-numCentaurPerProc = os.environ.get( "GFW_P8_%s_CENTAURS_PER_PROC" % thisSys );
+numProcs = os.environ.get( "GFW_P9_%s_NUM_PROCS" % thisSys );
+numCentaurPerProc = os.environ.get( "GFW_P9_%s_CENTAURS_PER_PROC" % thisSys );
 cmd = toolLoc + "/hb-pnor-vpd-preload.pl --numProcs " + numProcs + " --numCentPerProc " + numCentaurPerProc + " --machine " + thisSys + " --dataPath " + toolLoc
 print "Generate PNOR VPD for " + numProcs + " processor(s), and " + numCentaurPerProc + " Centaur(s) per Processor.";
 args = shlex.split( cmd );
diff --git a/src/build/simics/standalone.simics b/src/build/simics/standalone.simics
index 15b4ad6ac..215e80c95 100755
--- a/src/build/simics/standalone.simics
+++ b/src/build/simics/standalone.simics
@@ -6,14 +6,12 @@
 
 # @todo-RTC:127341 Standalaone VPD support
 # Preload VPD in PNOR
-#foreach $pnor in (get-object-list Lpc2SpiFpgaCmp) {
-#    try {
-#        run-python-file (lookup-file hbfw/hb-pnor-vpd-preload.py)
-#            ($pnor).sfc_master_mem.load-file ./sysmvpd.dat.ecc 0x1C5000
-#            ($pnor).sfc_master_mem.load-file ./sysspd.dat.ecc 0x17D000
-#            ($pnor).sfc_master_mem.load-file ./syscvpd.dat.ecc 0x255000
-#    } except { echo "ERROR: Failed to preload VPD into PNOR." }
-#}
+    try {
+        run-python-file (lookup-file hbfw/hb-pnor-vpd-preload.py)
+            ($hb_pnor).sfc_master_mem.load-file ./sysmvpd.dat.ecc 0x1C5000
+            ($hb_pnor).sfc_master_mem.load-file ./sysspd.dat.ecc 0x17D000
+            ($hb_pnor).sfc_master_mem.load-file ./syscvpd.dat.ecc 0x255000
+    } except { echo "ERROR: Failed to preload VPD into PNOR." }
 
 # Uncomment when PNOR is supported
 # @todo-RTC:130182 Enable PNOR access
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index 794530703..7cc5887cb 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -13,23 +13,13 @@ $hb_masterproc = ""
 @simenv.hb_masterproc = quiet_run_command("get-master-proc")[0]
 echo "Master Proc is: "+$hb_masterproc
 
-# Uncomment when PNOR is supported
-# @todo-RTC:130182 Enable PNOR access
-#$hb_pnor = ""
-#@simenv.hb_pnor = quiet_run_command("get-master-pnor")[0]
-#try {
-#    @SIM_get_object(simenv.hb_pnor[0])
-#} except {
-#    try {
-#        # Attempt to use the Brazos name
-#        @SIM_get_object("cecdrawer0_fpga0")
-#        $hb_pnor = "cecdrawer0_fpga0"
-#    } except {
-#        # Default to Tuleta/Orlena name
-#        $hb_pnor = "fpga0"
-#    }
-#}
-#echo "Master PNOR is: "+$hb_pnor
+$hb_pnor = ""
+
+foreach $pnor in (get-object-list - all BmcCmp) {
+  $hb_pnor = ($pnor)
+}
+
+echo "Master PNOR is: "+$hb_pnor
 
 # Choose a default core to start with
 $hb_cpu = "system_cmp0.cpu0_0_00_0"