diff options
author | aravnair-in <aravindnair@in.ibm.com> | 2017-12-14 05:15:51 -0600 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2017-12-22 15:07:18 -0500 |
commit | 536ae2496674e50bb9ca0b152ded65c25c7467d6 (patch) | |
tree | a133a5a30d0359d5a614bfc44cc61f17a815937e /src | |
parent | 79abc83621867b3fdcb4c22e41b87365ada8e7c7 (diff) | |
download | talos-hostboot-536ae2496674e50bb9ca0b152ded65c25c7467d6.tar.gz talos-hostboot-536ae2496674e50bb9ca0b152ded65c25c7467d6.zip |
Changes to make the DIMMs show up in Fleetwood
This change along with MRW changes ensure that CDIMMs show
up on a Fleetwood system
Change-Id: I6471b4c503d42b57a211c16a66bedf184757e387
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50925
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/usr/targeting/common/Targets.pm | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm index 7cf76796c..495c7606e 100644 --- a/src/usr/targeting/common/Targets.pm +++ b/src/usr/targeting/common/Targets.pm @@ -227,7 +227,6 @@ sub printTarget $target_id =~ s/\///g; $target_id =~ s/\-//g; - print $fh "\t<id>" . $target_id . "</id>\n"; if($self->getTargetType($target) eq 'unit-clk-slave') { @@ -591,7 +590,7 @@ sub prune ## - AFFINITY_PATH ## - ORDINAL_ID ## - HUID - +my $multiNode = 0; sub buildAffinity { my $self = shift; @@ -606,6 +605,8 @@ sub buildAffinity my $mcbist = -1; my $num_mc = 0 ; + $multiNode = 0; + $self->{membuf_inst_num}=0; ## count children target types @@ -649,6 +650,17 @@ sub buildAffinity $self->{membuf_inst_num} = 0; $node++; + if($pos > 0) + { + $multiNode = 1; + #reset the dimm index number across nodes + $self->{dimm_tpos} = 0; + } + else + { + $multiNode = 0; + } + $node_phys = "physical:".$sys_phys."/node-$node"; $node_aff = "affinity:".$sys_phys."/node-$node"; @@ -799,7 +811,7 @@ sub buildAffinity $self->iterateOverChiplets($target, $sys_pos, $node, $proc); $self->processMc($target, $sys_pos, $node, $proc, $parent_affinity, - $parent_physical, $node_phys ); + $parent_physical, $node_phys); } } } @@ -1225,7 +1237,6 @@ sub processDimms $self->setAttribute($dimm, "PHYS_PATH", $node_phys . "/dimm-" . $dimm_pos); - my $type = $self->getType($dimm); $self->setAttribute($dimm, "ORDINAL_ID",$dimm_pos); @@ -1510,7 +1521,6 @@ sub processMc $self->setAttribute($dimm, "VPD_REC_NUM", $aff_pos); $self->setHuid($dimm, $sys, $node); - $self->{targeting} ->{SYS}[0]{NODES}[$node]{PROCS}[$proc] {MC}[$mc]{MI}[$mi]{DMI}[$dmi] {MEMBUFS}[$membufnum]{MBAS}[$mba] {DIMMS}[$dimmPos]{KEY} = |