Skip to content

Commit

Permalink
Remove unused attributes in processMrw and computeProcPcieConfigAttrs
Browse files Browse the repository at this point in the history 
Change-Id: I7d84e2bef86ec17acc722f4ec9c9c19341d29ac8
RTC:160422
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37640
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
  • Loading branch information
@ploetzma @wghoffa
ploetzma authored and wghoffa committed Mar 30, 2017
1 parent 7e53643 commit 3c6ce44
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 153 deletions.
31 changes: 12 additions & 19 deletions src/usr/isteps/istep08/host_proc_pcie_scominit.C
View file
Expand Up @@ -551,20 +551,10 @@ errlHndl_t computeProcPcieConfigAttrs(TARGETING::Target * i_pProcChipTarget)
laneMaskNonBifurcated),"Failed to get "
"ATTR_PEC_PCIE_LANE_MASK_NON_BIFURCATED attribute");

TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL_NON_BIFURCATED_type
laneReversalNonBifurcated = {0};
assert(l_pec->tryGetAttr<
TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL_NON_BIFURCATED>(
laneReversalNonBifurcated),"Failed to get "
"ATTR_PEC_PCIE_IOP_REVERSAL_NON_BIFURCATED attribute");

memcpy(effectiveLaneMask,laneMaskNonBifurcated,
sizeof(effectiveLaneMask));

memcpy(effectiveLaneReversal,laneReversalNonBifurcated,
sizeof(effectiveLaneReversal));


#ifdef DYNAMIC_BIFURCATION
TARGETING::ATTR_PEC_PCIE_LANE_MASK_BIFURCATED_type
laneMaskBifurcated = {0};
Expand Down Expand Up @@ -626,32 +616,35 @@ errlHndl_t computeProcPcieConfigAttrs(TARGETING::Target * i_pProcChipTarget)

// TODO: Dynamic Bifurcation - For future partner development
// Only set if dynamic bifurcation and we need to re-compute
// the swap setting
// the swap and reversal setting
l_pec->setAttr<
TARGETING::ATTR_PEC_PCIE_IOP_SWAP>(effectiveLaneSwap);

l_pec->setAttr<
TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL>(effectiveLaneReversal);

#endif

l_pec->setAttr<
TARGETING::ATTR_PROC_PCIE_LANE_MASK>(effectiveLaneMask);

l_pec->setAttr<
TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL>(effectiveLaneReversal);
}
else
{
assert(l_pec->tryGetAttr<
TARGETING::ATTR_PROC_PCIE_LANE_MASK>(effectiveLaneMask),
"Failed to get ATTR_PROC_PCIE_LANE_MASK attribute");

assert(l_pec->tryGetAttr<
TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL>
(effectiveLaneReversal),
"Failed to get ATTR_PEC_PCIE_IOP_REVERSAL attribute");

// While we aren't using the attribute in this function, we
// should still make sure it's set
// should still make sure swap and reversal are set
assert(l_pec->tryGetAttr<
TARGETING::ATTR_PROC_PCIE_IOP_SWAP>(effectiveLaneSwap),
"Failed to get ATTR_PROC_PCIE_IOP_SWAP attribute");

assert(l_pec->tryGetAttr<
TARGETING::ATTR_PEC_PCIE_IOP_REVERSAL>
(effectiveLaneReversal),
"Failed to get ATTR_PEC_PCIE_IOP_REVERSAL attribute");
}

TARGETING::ATTR_PROC_PCIE_PHB_ACTIVE_type pecPhbActiveMask = 0;
Expand Down
137 changes: 3 additions & 134 deletions src/usr/targeting/common/processMrw.pl
View file
Expand Up @@ -949,33 +949,6 @@ sub processPec
$lane_mask[2][0] = "0x0000";
$lane_mask[3][0] = "0x0000";

my @lane_rev;
$lane_rev[0][0] = "";
$lane_rev[1][0] = "";
$lane_rev[2][0] = "";
$lane_rev[3][0] = "";

my @is_slot;
$is_slot[0][0] = 0;
$is_slot[1][0] = 0;
$is_slot[2][0] = 0;
$is_slot[3][0] = 0;

my $phb_config = "00000000";

my %cfg_check;
my @equalization;

my @lane_eq;
my $NUM_PHBS=6;
for (my $p=0;$p<$NUM_PHBS;$p++)
{
for (my $lane=0;$lane<16;$lane++)
{
$equalization[$p][$lane] = "0x00,0x00";
}
}

my $pec_iop_swap = 0;
my $bitshift_const = 0;
my $pec_num = $targetObj->getAttribute
Expand All @@ -996,24 +969,13 @@ sub processPec
{
# We have a PHB connection
# We need to create the PEC attributes
my $iop_num = $targetObj->getAttribute
($phb_config_child, "IOP_NUM");
my $phb_num = $targetObj->getAttribute
($phb_config_child, "PHB_NUM");

# Get lane group and set lane masks
my $lane_group = $targetObj->getAttribute
($phb_config_child, "PCIE_LANE_GROUP");

my $pci_endpoint=$targetObj->getFirstConnectionDestination
($phb_config_child);
my $pci_endpoint_type =
$targetObj->getAttribute(
$targetObj->getTargetParent($pci_endpoint), "CLASS");

if ($pci_endpoint_type eq "CARD")
{
$is_slot[$lane_group][0] = 1;
}

# Set up Lane Swap attribute
# Get attribute that says if lane swap is set up for this
# bus. Taken as a 1 or 0 (on or off)
Expand Down Expand Up @@ -1075,108 +1037,15 @@ sub processPec
$lane_mask[$lane_group][0] =
$targetObj->getAttribute
($phb_config_child, "PCIE_LANE_MASK");
$lane_rev[$lane_group][0] =
$targetObj->getBusAttribute
($phb_config_child, 0, "LANE_REVERSAL");


my $eq = $targetObj->getBusAttribute
($phb_config_child, 0, "PCIE_LANE_EQUALIZATION");
my @eqs = split(/\,/,$eq);
for (my $e=0;$e<@eqs;$e=$e+3)
{
if ($eqs[$e] eq "all")
{
for (my $lane=0;$lane<16;$lane++)
{
$equalization[$phb_num][$lane]=
$eqs[$e+1].",".$eqs[$e+2];
}
}
else
{
$equalization[$phb_num][$eqs[$e]] =
$eqs[$e+1].",".$eqs[$e+2];
}
}

my $swap_clks=$targetObj->getBusAttribute
($phb_config_child, 0, "PCIE_SWAP_CLKS");

my $lane_rev=$targetObj->getBusAttribute
($phb_config_child, 0, "LANE_REVERSAL");

# TODO RTC:167304
#my $capi = $targetObj->getAttribute($child, "ENABLE_CAPI");

$targetObj->setAttribute
($parentTarget, "PROC_PCIE_PHB_ACTIVE","0x0");
my $lane_mask_attr = sprintf("%s,%s,%s,%s",
$lane_mask[0][0], $lane_mask[1][0],
$lane_mask[2][0], $lane_mask[3][0]);

$targetObj->setAttribute($target, "PROC_PCIE_LANE_MASK",
$lane_mask_attr);
$targetObj->setAttribute($target,
"PEC_PCIE_LANE_MASK_NON_BIFURCATED", $lane_mask_attr);
$targetObj->setAttribute
($target, "PEC_PCIE_LANE_MASK_BIFURCATED", "0,0,0,0");

#TODO RTC:167304
# my @iop_swap_lu;
# my @iop_lane_swap;
# 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];
# $iop_swap_lu[$iop]=
# "0b".$iop_swap{$iop}{$iop_lane_swap[$iop]}{$lane_rev};
# if ($iop_swap_lu[$iop] eq "") {
# die "PCIE config for $iop,$iop_lane_swap[$iop], "
# "$lane_rev not found\n";
# }
# }
# my $lane_rev_attr0 = sprintf("%s,%s,%s",
# oct($iop_swap_lu[0]),
# oct($iop_swap_lu[1]),
# oct($iop_swap_lu[2]));
# my $lane_rev_attr1 = sprintf("%s,0,%s,0,%s,0",
# oct($iop_swap_lu[0]),
# oct($iop_swap_lu[1]),
# oct($iop_swap_lu[2]));
# $targetObj->setAttribute($target, "PROC_PCIE_IOP_SWAP",
# $lane_rev_attr0);
# $targetObj->setAttribute($target,
# "PEC_PCIE_IOP_SWAP_NON_BIFURCATED", $lane_rev_attr1);
$targetObj->setAttribute($target,
"PEC_PCIE_IOP_SWAP_BIFURCATED", "0");
$targetObj->setAttribute($target,
"PEC_PCIE_IOP_REVERSAL", "0");
$targetObj->setAttribute($target,
"PEC_PCIE_IOP_REVERSAL_NON_BIFURCATED","0");
$targetObj->setAttribute($target,
"PEC_PCIE_IOP_REVERSAL_BIFURCATED", "0");

# TODO RTC:167304
#my $is_slot_attr = sprintf("%s,%s,%s,%s,%s,%s",
# $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($target, "PROC_PCIE_IS_SLOT",
# $is_slot_attr);

#my $eq_str="";
#for (my $p=0;$p<$NUM_PHBS;$p++)
#{
# for (my $lane=0;$lane<16;$lane++)
# {
# $eq_str=$eq_str.$equalization[$p][$lane].",";
# }
#}
#$eq_str = substr($eq_str,0,length($eq_str)-1);
#$targetObj->setAttribute($target,
# "PROC_PCIE_LANE_EQUALIZATION", $eq_str);

} # Found connection
} # PHB bus loop

Expand Down

0 comments on commit 3c6ce44

Please sign in to comment.