Skip to content

Commit

Permalink
Enabling FSP-B IPL as primary
Browse files Browse the repository at this point in the history 
Change-Id: Iedb39c201a4b6c500115fbfb34716729ec931d16
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54547
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
  • Loading branch information
@venkateshsainath @wghoffa
venkateshsainath authored and wghoffa committed Feb 22, 2018
1 parent b47f658 commit 44087e0
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 17 deletions.
28 changes: 22 additions & 6 deletions src/usr/targeting/common/Targets.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1614,22 +1614,38 @@ sub setFsiAttributes
{
$self->setAttribute($target, "FSI_MASTER_TYPE","CMFSI");
}
$self->setAttribute($target, "FSI_MASTER_CHIP","physical:sys-0");
$self->setAttribute($target, "FSI_MASTER_PORT","0xFF");
$self->setAttribute($target, "ALTFSI_MASTER_CHIP","physical:sys-0");
$self->setAttribute($target, "ALTFSI_MASTER_PORT","0xFF");
if ($self->isBadAttribute($target, "FSI_MASTER_CHIP"))
{
$self->setAttribute($target, "FSI_MASTER_CHIP","physical:sys-0");
$self->setAttribute($target, "FSI_MASTER_PORT","0xFF");
}
if ($self->isBadAttribute($target,"ALTFSI_MASTER_CHIP"))
{
$self->setAttribute($target, "ALTFSI_MASTER_CHIP","physical:sys-0");
$self->setAttribute($target, "ALTFSI_MASTER_PORT","0xFF");
}
$self->setAttribute($target, "FSI_SLAVE_CASCADE", "0");
if ($cmfsi == 0)
if ($type eq "FSICM")
{
$self->setAttribute($target, "FSI_MASTER_CHIP",$phys_path);
$self->setAttribute($target, "FSI_MASTER_PORT", $fsi_port);
$self->setAttribute($target, "ALTFSI_MASTER_CHIP",$phys_path);
$self->setAttribute($target, "ALTFSI_MASTER_PORT", $fsi_port);
}
else
{
if ($flip_port eq 0 )
{
$self->setAttribute($target, "FSI_MASTER_CHIP",$phys_path);
$self->setAttribute($target, "FSI_MASTER_PORT", $fsi_port);
}
else
{
$self->setAttribute($target, "ALTFSI_MASTER_CHIP",$phys_path);
$self->setAttribute($target, "ALTFSI_MASTER_PORT", $fsi_port);
}
}

$self->setAttributeField($target, "FSI_OPTION_FLAGS","flipPort",
$flip_port);
$self->setAttributeField($target, "FSI_OPTION_FLAGS","reserved", "0");
Expand Down
32 changes: 21 additions & 11 deletions src/usr/targeting/common/processMrw.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,13 +919,16 @@ sub processProcessor
if ($proc_type eq "ACTING_MASTER" )
{
$targetObj->setAttributeField($target, "FSI_OPTION_FLAGS", "reserved",
if($targetObj->isBadAttribute($target, "FSI_MASTER_TYPE"))
{
$targetObj->setAttributeField($target, "FSI_OPTION_FLAGS", "reserved",
"0");
$targetObj->setAttribute($target, "FSI_MASTER_CHIP", "physical:sys-0");
$targetObj->setAttribute($target, "FSI_MASTER_PORT", "0xFF");
$targetObj->setAttribute($target, "ALTFSI_MASTER_CHIP", "physical:sys-0");
$targetObj->setAttribute($target, "ALTFSI_MASTER_PORT", "0xFF");
$targetObj->setAttribute($target, "FSI_MASTER_TYPE", "NO_MASTER");
$targetObj->setAttribute($target, "FSI_MASTER_CHIP", "physical:sys-0");
$targetObj->setAttribute($target, "FSI_MASTER_PORT", "0xFF");
$targetObj->setAttribute($target, "ALTFSI_MASTER_CHIP", "physical:sys-0");
$targetObj->setAttribute($target, "ALTFSI_MASTER_PORT", "0xFF");
$targetObj->setAttribute($target, "FSI_MASTER_TYPE", "NO_MASTER");
}
$targetObj->setAttribute($target, "FSI_SLAVE_CASCADE", "0");
$targetObj->setAttributeField($target, "SCOM_SWITCHES", "useSbeScom",
"1");
Expand All @@ -934,7 +937,10 @@ sub processProcessor
}
else
{
$targetObj->setAttribute($target, "ALTFSI_MASTER_CHIP", "physical:sys-0");
if($targetObj->isBadAttribute($target, "ALTFSI_MASTER_CHIP"))
{
$targetObj->setAttribute($target, "ALTFSI_MASTER_CHIP", "physical:sys-0");
}
$targetObj->setAttributeField($target, "SCOM_SWITCHES", "useSbeScom",
"0");
$targetObj->setAttributeField($target, "SCOM_SWITCHES", "useFsiScom",
Expand Down Expand Up @@ -1430,13 +1436,17 @@ sub processFsi
# | Slave | | Slave |
# | | | |
# |--------| |---------|
my $fsi_child_type = $targetObj->getType($fsi_child_target);
if ( $fsi_child_type eq "PROC" )
my $source_type = $targetObj->getType($parentTarget);
if ( $source_type eq "PROC" )
{
my $proc_type = $targetObj->getAttribute($fsi_child_target, "PROC_MASTER_TYPE");
my $proc_type = $targetObj->getAttribute($parentTarget, "PROC_MASTER_TYPE");
if ($proc_type eq "ACTING_MASTER" || $proc_type eq "MASTER_CANDIDATE" )
{
$flip_port = 1;
my $fcid = $targetObj->getAttribute($parentTarget,"FABRIC_CHIP_ID");
if($fcid eq 1)
{
$flip_port = 1;
}
}
}
$targetObj->setFsiAttributes($fsi_child_target,
Expand Down

0 comments on commit 44087e0

Please sign in to comment.