Updates to make Venice Simics model work

RTC: 95325
Change-Id: Iccc99e293c7031a4d926be061c7a41b8c55f8f13
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13326
Tested-by: Jenkins Server
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 39 insertions, 34 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 310f2db9f..d0d25bd77 100644
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -175,6 +175,7 @@ simics.tar_CONTENTS = \
     src/build/simics/hb-pnor-vpd-preload.pl \
     img/dimmspd.dat \
     img/procmvpd.dat \
+    img/procmvpd_ven.dat \
     img/cvpd.dat \
     obj/genfiles/fapiAttrInfo.csv \
     obj/genfiles/fapiAttrEnumInfo.csv \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index a04979eb8..c0b09007c 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -297,7 +297,6 @@ PNOR_IMG_INFO = \
    venice.pnor:defaultPnorLayout.xml:${VENICE_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \
    ${FIPS_PNOR_INFO}
 
-
 __IMAGE_BUILD/% : .SPECTARG .PMAKE cp_hbfiles inject_ecc
 	@${MAKE:T:R} BUILD_SPECIFIC_IMAGE \
 	    "IMAGE_PARAMS=${.TARGET:s/__IMAGE_BUILD\///:s/:/ /g}"
diff --git a/src/build/simics/hb-pnor-vpd-preload.pl b/src/build/simics/hb-pnor-vpd-preload.pl
index 973c32222..fabd2cd3a 100755
--- a/src/build/simics/hb-pnor-vpd-preload.pl
+++ b/src/build/simics/hb-pnor-vpd-preload.pl
@@ -6,7 +6,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2014
+# [+] 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.
@@ -51,6 +53,7 @@ my $emptyCVPD;
 ($emptyCVPDfh, $emptyCVPD) = tempfile();
 
 my $mvpdFile = "procmvpd.dat";
+my $mvpdFile_ven = "procmvpd_ven.dat";
 my $cvpdFile = "cvpd.dat";
 my $spdFile = "dimmspd.dat";
 my $sysMVPD = "sysmvpd.dat";
@@ -150,6 +153,13 @@ elsif(length($procConfig) != $maxProcs)
     exit 1;
 }
 
+#if Machine is HABANERO exit out -- HB collects the VPD itself
+if($machine eq "HABANERO")
+{
+    print "PNOR VPD Data Build Not needed.\n";
+    exit 0;
+}
+
 getCentaurConfig();
 createMVPDData();
 createCVPDData();
@@ -271,7 +281,14 @@ sub createMVPDData
         if( substr($procConfig,$proc,1) =~ /1/ )
         {
             # Use real data to the full image.
-            $sourceFile = "$dataPath/$mvpdFile";
+            if( $machine eq "VENICE" )
+            {
+                $sourceFile = "$dataPath/$mvpdFile_ven";
+            }
+            else
+            {
+                $sourceFile = "$dataPath/$mvpdFile";
+            }
         }
         else
         {
@@ -464,26 +481,12 @@ sub getCentaurConfig
             {
                 # Plugging order is:
                 #   Processor 0 - 7
-                #   MCS 4 - 7, then 0 - 3
-                if( ($numCentPerProc <= 4) &&
-                    ($mcs >= 4) &&
-                    ($mcs <= (4 + ($numCentPerProc - 1))) )
+                #   MCS 0 - 7, then 0 - 3
+                if( $mcs >= 0 &&
+                    $mcs <= (($numCentPerProc - 1)) )
                 {
                     $mcsArray[$mcs] = 1;
                 }
-                elsif( $numCentPerProc > 4 )
-                {
-                    if( $mcs >= 4 &&
-                        $mcs <= 7 )
-                    {
-                        $mcsArray[$mcs] = 1;
-                    }
-                    elsif( $mcs >= 0 &&
-                           $mcs < ($numCentPerProc - 4) )
-                    {
-                        $mcsArray[$mcs] = 1;
-                    }
-                }
             }
             elsif( $machine eq "TULETA" )
             {
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index 096f1a2c1..bd7db5b3d 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -3,7 +3,7 @@ $hb_startup_path = (lookup-file hbfw/startup.simics)
 $hb_script_location = (python "''.join(map('/'.__add__,\""+$hb_startup_path+"\"[1:].split('/')[0:-1]))")
 python "os.environ['HB_TOOLPATH'] = \""+$hb_script_location+"\""
 
-$hb_machine = (shell "env | grep 'GFW_P8_.*_PROC_CCIN' | sed 's/GFW_P8_\\(.*\\)_PROC_CCIN.*/\\1/'")
+$hb_machine = (shell "env | grep 'GFW_P8_.*_PROC_EC' | sed 's/GFW_P8_\\(.*\\)_PROC_EC.*/\\1/'")
 $hb_machine = (python "\""+$hb_machine+"\".lower()")
 python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\""
 
diff --git a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
index e48b8c180..c167b3584 100644
--- a/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_VENICE.system.xml
@@ -63,11 +63,11 @@
     <!-- System Attributes from MRW -->
     <attribute>
         <id>FREQ_PROC_REFCLOCK</id>
-        <default>200</default>
+        <default>133</default>
     </attribute>
     <attribute>
         <id>FREQ_PROC_REFCLOCK_KHZ</id>
-        <default>200000</default>
+        <default>133333</default>
     </attribute>
     <attribute>
         <id>FREQ_MEM_REFCLOCK</id>
@@ -2808,8 +2808,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default>
-        <!-- @fixme : should be MFSI but support for alt-master is under Story 3853 -->
+        <default>MFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -9932,7 +9931,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>4</default>
+        <default>0</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10049,7 +10048,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>5</default>
+        <default>1</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10166,7 +10165,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>6</default>
+        <default>3</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10283,7 +10282,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>7</default>
+        <default>3</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10400,7 +10399,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>0</default>
+        <default>4</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10517,7 +10516,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>1</default>
+        <default>5</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10634,7 +10633,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>2</default>
+        <default>6</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
@@ -10751,7 +10750,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
-        <default>3</default>
+        <default>7</default>
     </attribute>
     <attribute>
         <id>FSI_SLAVE_CASCADE</id>
diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile
index 7c07d4866..781a2f654 100644
--- a/src/usr/vpd/makefile
+++ b/src/usr/vpd/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2013,2014
+# [+] 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.
@@ -38,6 +40,7 @@ SUBDIRS += runtime.d
 BINARY_FILES = $(IMGDIR)/dimmspd.dat:3a9f53e3684e57401ed0aed75f25980fca99f40b
 #Update to Murano DD2.1 for CCIN 54E6
 BINARY_FILES += $(IMGDIR)/procmvpd.dat:c510eda768a9e3921ff957b549574507fd5c9ce9
+BINARY_FILES += $(IMGDIR)/procmvpd_ven.dat:683bdae079c2e2708ffda655dbd849f14a16f816
 #Update to Centaur DD2.0 for CCIN 31E8
 BINARY_FILES += $(IMGDIR)/cvpd.dat:2e33352ca95279b992927336567adf960dca7d46