Fixing flipport attribute for processors

Change-Id: I9e1342c0012b54d8322d7bd29451da07a682f242
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54652
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
CI-Ready: Dean Sanner <dsanner@us.ibm.com>
CI-Ready: William G. Hoffa <wghoffa@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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

2 files changed, 17 insertions, 2 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index 4aa7e3757..ccde8e2ba 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -1604,6 +1604,7 @@ sub setFsiAttributes
     my $phys_path = shift;
     my $fsi_port = shift;
     my $flip_port = shift;
+    my $altfsiswitch = shift;
 
     $self->setAttribute($target, "FSI_MASTER_TYPE","NO_MASTER");
     if ($type eq "FSIM")
@@ -1634,7 +1635,7 @@ sub setFsiAttributes
     }
     else
     {
-      if ($flip_port eq 0 )
+      if ($altfsiswitch eq 0 )
       {
         $self->setAttribute($target, "FSI_MASTER_CHIP",$phys_path);
         $self->setAttribute($target, "FSI_MASTER_PORT", $fsi_port);
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 64ba3959a..84195356e 100755
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -1383,6 +1383,7 @@ sub processFsi
         my $proc_path = $targetObj->getAttribute($parentTarget,"PHYS_PATH");
         my $fsi_child_target = $targetObj->getTargetParent($fsi_child_conn);
         my $flip_port         = 0;
+        my $altfsiswitch      = 0;
 
         # If this is a proc that can be a master, then we need to set flip_port
         # attribute in FSI_OPTIONS. $flip_port tells us which FSI port to write to.
@@ -1445,12 +1446,25 @@ sub processFsi
                 my $fcid = $targetObj->getAttribute($parentTarget,"FABRIC_CHIP_ID");
                 if($fcid eq 1)
                 {
+                  $altfsiswitch = 1;
+                }
+            }
+        }
+        my $dest_type = $targetObj->getType($fsi_child_target);
+        if ($dest_type eq "PROC" )
+        {
+            my $proc_type = $targetObj->getAttribute($fsi_child_target, "PROC_MASTER_TYPE");
+            if ($proc_type eq "ACTING_MASTER" || $proc_type eq "MASTER_CANDIDATE" )
+            {
+                my $fcid = $targetObj->getAttribute($fsi_child_target,"FABRIC_CHIP_ID");
+                if($fcid eq 1)
+                {
                   $flip_port = 1;
                 }
             }
         }
         $targetObj->setFsiAttributes($fsi_child_target,
-                    $type,$cmfsi,$proc_path,$fsi_link,$flip_port);
+                    $type,$cmfsi,$proc_path,$fsi_link,$flip_port,$altfsiswitch);
     }
 }