diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-09-13 14:11:59 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-09-15 21:38:48 -0400 |
| commit | a40aa3a47a27cde188fcbfa5ddb95601d51eb0d4 (patch) | |
| tree | 1dc19500212493997d7c7f85b15746ea6f58df77 /src/usr/targeting | |
| parent | 10044c2f1c786062de9dbec1fc9d96d6477331b4 (diff) | |
| download | talos-hostboot-a40aa3a47a27cde188fcbfa5ddb95601d51eb0d4.tar.gz talos-hostboot-a40aa3a47a27cde188fcbfa5ddb95601d51eb0d4.zip | |
add support for MBA_PORT/MBA_DIMM and CEN_MBA_PORT/CEN_MBA_DIMM
Change-Id: I676fff2a91baf1e1d3704c7f04852a186e634dd0
CQ:SW401976
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46162
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: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rw-r--r-- | src/usr/targeting/common/Targets.pm | 15 | ||||
| -rwxr-xr-x | src/usr/targeting/common/processMrw.pl | 6 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/target_types.xml | 2 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm index 394f84b63..0aa077b8b 100644 --- a/src/usr/targeting/common/Targets.pm +++ b/src/usr/targeting/common/Targets.pm @@ -1378,6 +1378,21 @@ sub processMc $self->setAttribute($dimm,"MBA_PORT",$port_num); $self->setAttribute($dimm,"MBA_DIMM",$dimm_num); + #Centaur/Membufs use CEN_MBA_PORT and not MBA_PORT + #For now, support both. + if (!$self->isBadAttribute($ddr, "CEN_MBA_PORT")) + { + $port_num = $self->getAttribute($ddr,"CEN_MBA_PORT"); + $self->setAttribute($dimm,"CEN_MBA_PORT",$port_num); + + } + if (!$self->isBadAttribute($ddr, "CEN_MBA_DIMM")) + { + $dimm_num = $self->getAttribute($ddr,"CEN_MBA_DIMM"); + $self->setAttribute($dimm,"CEN_MBA_DIMM",$dimm_num); + + } + my $aff_pos = DIMMS_PER_PROC*$proc+ DIMMS_PER_DMI*$dmi_num+ DIMMS_PER_MBAPORT*$mba+ diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl index 5013bbc9a..8051d1793 100755 --- a/src/usr/targeting/common/processMrw.pl +++ b/src/usr/targeting/common/processMrw.pl @@ -291,12 +291,6 @@ foreach my $target (sort keys %{ $targetObj->getAllTargets() }) { processMembuf($targetObj, $target); } - elsif ($type eq "DIMM") - { - #TODO RTC: 178351 Remove depricated Attribute from HB XML - $targetObj->deleteAttribute($target,"MBA_DIMM"); - $targetObj->deleteAttribute($target,"MBA_PORT"); - } elsif ($type eq "PHB") { #TODO RTC: 178351 Remove depricated Attribute from HB XML diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index 6e1d84ebe..62a236cf4 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -465,6 +465,8 @@ <id>FRU_ID</id> </attribute> <attribute><id>REL_POS</id></attribute> + <attribute><id>MBA_PORT</id></attribute> + <attribute><id>MBA_DIMM</id></attribute> </targetType> <targetType> |
