Fix plugging order for Tuleta in VPD preload script

The original assumptions regarding the DIMM plugging order in
hb-pnor-mvpd-preload.pl was incorrect for Tuleta.  I updated
to be correct.

In a few weeks we should be able to disable this code, but
it's needed for the moment to support the Multi-chip bringup
efforts.

This issue was identified with Defect SW168323.

Change-Id: I3bae0aebbabc9da07f87f379a2f6c2dd15db15c8
Tested-by: Jenkins Server
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 17 insertions, 3 deletions

diff --git a/src/build/simics/hb-pnor-mvpd-preload.pl b/src/build/simics/hb-pnor-mvpd-preload.pl
index 54a144965..a176d261b 100755
--- a/src/build/simics/hb-pnor-mvpd-preload.pl
+++ b/src/build/simics/hb-pnor-mvpd-preload.pl
@@ -268,12 +268,26 @@ sub createSPDData
         {
             # Plugging order is:
             #   Processor 0 - 3
-            #   MCS 7 - 4 (1 Centaury/MCS)
-            if( $mcs >= (7 - ($numCentPerProc - 1)) &&
-                $mcs <= 7 )
+            #   MCS 4 - 7, then 0 - 3 (1 Centaur/MCS)
+            if( ($numCentPerProc <= 4) &&
+                ($mcs >= 4) &&
+                ($mcs <= (4 + ($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;
+                   }
+            }
         }
         else
         {