Fixed 32 bit machine address overflow problem and added support for 3rd IOP (Naples).

1 files changed, 33 insertions, 17 deletions

diff --git a/scripts/processMrw.pl b/scripts/processMrw.pl
index c735e97..7d7b50a 100755
--- a/scripts/processMrw.pl
+++ b/scripts/processMrw.pl
@@ -606,8 +606,8 @@ sub setupBars
         {
             for (my $i=0;$i<$num;$i++)
             {
-                my $b=sprintf("0x%016X",
-         $i_base+$i_node_offset*$node+$i_proc_offset*$proc+$i_offset*$i);
+                my $b=sprintf("0x%016s",substr((
+			$i_base+$i_node_offset*$node+$i_proc_offset*$proc+$i_offset*$i)->as_hex(),2));  #Note: Hex convert method avoids overflow on 32bit machines.
                 my $sep=",";
                 if ($i==$num-1)
                 {
@@ -640,8 +640,8 @@ sub processMcs
     my $i_offset = Math::BigInt->new($offset);
 
     my $mcs = $targetObj->getAttribute($target, "MCS_NUM");
-    my $mcsStr=sprintf("0x%016X",
-         $i_base+$i_node_offset*$node+$i_proc_offset*$proc+$i_offset*$mcs);
+    my $mcsStr=sprintf("0x%016s",substr((
+         $i_base+$i_node_offset*$node+$i_proc_offset*$proc+$i_offset*$mcs)->as_hex(),2));  #Note: Hex convert method avoids overflow on 32bit machines.
     $targetObj->setAttribute($target, "IBSCOM_MCS_BASE_ADDR", $mcsStr);
 }
 
@@ -771,33 +771,38 @@ sub processPcie
     ## this is a special target whose children are the different ways
     ## to configure iop/phb's
 
-    # TODO RTC: TBD
-    # add a 3rd IOP for Naples
-
     ## Get config children
     my @lane_swap;
     $lane_swap[0][0] = 0;
     $lane_swap[0][1] = 0;
     $lane_swap[1][0] = 0;
     $lane_swap[1][1] = 0;
+    $lane_swap[2][0] = 0;
+    $lane_swap[2][1] = 0;
 
     my @lane_mask;
     $lane_mask[0][0] = "0x0000";
     $lane_mask[0][1] = "0x0000";
     $lane_mask[1][0] = "0x0000";
     $lane_mask[1][1] = "0x0000";
+    $lane_mask[2][0] = "0x0000";
+    $lane_mask[2][1] = "0x0000";
 
     my @lane_rev;
     $lane_rev[0][0] = "";
     $lane_rev[0][1] = "";
     $lane_rev[1][0] = "";
     $lane_rev[1][1] = "";
+    $lane_rev[2][0] = "";
+    $lane_rev[2][1] = "";
 
     my @is_slot;
     $is_slot[0][0] = 0;
     $is_slot[0][1] = 0;
     $is_slot[1][0] = 0;
     $is_slot[1][1] = 0;
+    $is_slot[2][0] = 0;
+    $is_slot[2][1] = 0;
 
     my $phb_config = "00000000";
 
@@ -831,6 +836,16 @@ sub processPcie
     $iop_swap{1}{1}{'01'}=$t[14];
     $iop_swap{1}{1}{'11'}=$t[15];
 
+    $iop_swap{2}{0}{'00'}=$t[8];
+    $iop_swap{2}{0}{'01'}=$t[9];
+    $iop_swap{2}{0}{'10'}=$t[10];
+    $iop_swap{2}{0}{'11'}=$t[11];
+    $iop_swap{2}{1}{'00'}=$t[12];
+    $iop_swap{2}{1}{'10'}=$t[13];
+    $iop_swap{2}{1}{'01'}=$t[14];
+    $iop_swap{2}{1}{'11'}=$t[15];
+
+
     my @lane_eq;
     my $NUM_PHBS=4;
     for (my $p=0;$p<$NUM_PHBS;$p++)
@@ -902,9 +917,10 @@ sub processPcie
     my $hex = sprintf('%X', oct("0b$phb_config"));
 
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_PHB_ACTIVE","0x" . $hex);
-    my $lane_mask_attr = sprintf("%s,%s,%s,%s",
+    my $lane_mask_attr = sprintf("%s,%s,%s,%s,%s,%s",
         $lane_mask[0][0], $lane_mask[0][1],
-        $lane_mask[1][0], $lane_mask[1][1]);
+        $lane_mask[1][0], $lane_mask[1][1],
+        $lane_mask[2][0], $lane_mask[2][1]);
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_LANE_MASK",
         $lane_mask_attr);
     $targetObj->setAttribute($parentTarget,"PROC_PCIE_LANE_MASK_NON_BIFURCATED",
@@ -914,7 +930,7 @@ sub processPcie
 
     my @iop_swap_lu;
     my @iop_lane_swap;
-    for (my $iop=0;$iop<2;$iop++)
+    for (my $iop=0;$iop<3;$iop++)
     {
         $iop_lane_swap[$iop] = $lane_swap[$iop][0] | $lane_swap[$iop][1];
         my $lane_rev = $lane_rev[$iop][0].$lane_rev[$iop][1];
@@ -924,10 +940,10 @@ sub processPcie
           die "PCIE config for $iop,$iop_lane_swap[$iop],$lane_rev not found\n";
         }
     }
-    my $lane_swap_attr0 = sprintf("%s,%s",$iop_lane_swap[0],
-                          $iop_lane_swap[1]);
-    my $lane_swap_attr1 = sprintf("%s,0,%s,0",$iop_lane_swap[0],
-                          $iop_lane_swap[1]);
+    my $lane_swap_attr0 = sprintf("%s,%s,%s",$iop_lane_swap[0],
+                          $iop_lane_swap[1],$iop_lane_swap[2]);
+    my $lane_swap_attr1 = sprintf("%s,0,%s,0,%s,0",$iop_lane_swap[0],
+                          $iop_lane_swap[1],$iop_lane_swap[2]);
 
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_IOP_SWAP",
         $lane_swap_attr0);
@@ -936,8 +952,8 @@ sub processPcie
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_IOP_SWAP_BIFURCATED",
         "0,0,0,0");
 
-    my $lane_rev_attr = sprintf("%s,0,%s,0",
-                         oct($iop_swap_lu[0]),oct($iop_swap_lu[1]));
+    my $lane_rev_attr = sprintf("%s,0,%s,0,%s,0",
+                         oct($iop_swap_lu[0]),oct($iop_swap_lu[1]),oct($iop_swap_lu[2]));
 
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_IOP_REVERSAL",
         $lane_rev_attr);
@@ -947,7 +963,7 @@ sub processPcie
         "0,0,0,0");
 
     my $is_slot_attr = sprintf("%s,%s,%s,%s",
-        $is_slot[0][0], $is_slot[0][1], $is_slot[1][0], $is_slot[1][1]);
+        $is_slot[0][0], $is_slot[0][1], $is_slot[1][0], $is_slot[1][1], $is_slot[2][0], $is_slot[2][1]);
     $targetObj->setAttribute($parentTarget, "PROC_PCIE_IS_SLOT", $is_slot_attr);
 
     ## don't support DSMP