processMrw: multinode updates

-- correctly set FABRIC_TO_PHYSICAL_NODE_MAP
-- FAPI_POS for node target was fixed

Change-Id: I7822c8cc1a04ff9cb2b9fa9e12eb92b3fe839fe9
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53400
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sakethan R. Kotta <sakkotta@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

Author: Prachi Gupta

src/usr/targeting/common/Targets.pm

@@ -651,7 +651,7 @@ sub buildAffinity
             $self->{membuf_inst_num} = 0;
             $node++;
 
-            if($pos > 0)
+            if($node > 0)
             {
                 $multiNode = 1;
                 #reset the dimm index number across nodes
@@ -669,7 +669,7 @@ sub buildAffinity
 
             $self->setHuid($target, $sys_pos, $node);
             $self->setAttribute($target, "FAPI_NAME",$self->getFapiName($type));
-            $self->setAttribute($target, "FAPI_POS",      $pos);
+            $self->setAttribute($target, "FAPI_POS",      $node);
             $self->setAttribute($target, "PHYS_PATH",     $node_phys);
             $self->setAttribute($target, "AFFINITY_PATH", $node_aff);
 

src/usr/targeting/common/processMrw.pl

@@ -2326,6 +2326,9 @@ sub get_max_compute_nodes
    ##
    #Proceeed only for sys targets
    ##
+   #For fabric_node_map, we store the node's position at the node
+   #position's index
+   my @fabric_node_map = (255, 255, 255, 255, 255, 255, 255, 255);
    if ($targetObj->getType($sysTarget) eq "SYS")
    {
       foreach my $child (@{$targetObj->getTargetChildren($sysTarget)})
@@ -2335,7 +2338,9 @@ sub get_max_compute_nodes
             my $attrVal =  $targetObj->getAttribute($child, "ENC_TYPE");
             if ($attrVal eq "CEC")
             {
-               $retVal++;
+                my $fapi_pos = $targetObj->getAttribute($child, "FAPI_POS");
+                $fabric_node_map[$fapi_pos] = $fapi_pos;
+                $retVal++;
             }
          }
       }
@@ -2348,6 +2353,17 @@ sub get_max_compute_nodes
       {
          $retVal = 1;
       }
+
+      #Convert array into a comma separated string
+      my $node_map = "";
+      foreach my $i (@fabric_node_map)
+      {
+            $node_map .= "$i,";
+      }
+
+      #remove the last comma
+      $node_map =~ s/.$//;
+      $targetObj->setAttribute($sysTarget, "FABRIC_TO_PHYSICAL_NODE_MAP", $node_map);
    }
    return $retVal;
 }