summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrachi Gupta <pragupta@us.ibm.com>2018-03-08 12:26:47 -0600
committerWilliam G. Hoffa <wghoffa@us.ibm.com>2018-03-08 17:03:02 -0500
commitb98f4c6b59fa881b95d1022333ffafb2f927427b (patch)
tree3099deb96d3c3025847fdfe912b019ac1b4ab891
parent4cf79f8dc40b280faf5aac52bad3e684138e2052 (diff)
downloadtalos-hostboot-b98f4c6b59fa881b95d1022333ffafb2f927427b.tar.gz
talos-hostboot-b98f4c6b59fa881b95d1022333ffafb2f927427b.zip
ATTR_PBAX_GROUPID: add global tag
PBAX_GROUPID is a proc level attr that needs to be incrememnted per node. The only way to set this correctly in MRW is to add a global tag. However, making it global may break other systems as the global value in their respective MRW won't be set. It will be set on proc_socket level. Therefore, added a check to only copy global values if they are not empty (aka someone must explicitly set the global value for us to use those values). Change-Id: I3055d8296c010f996d98d7578a9adee5b763d316 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55257 Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com> 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: William G. Hoffa <wghoffa@us.ibm.com>
-rw-r--r--src/usr/targeting/common/Targets.pm5
-rw-r--r--src/usr/targeting/common/xmltohb/hb_customized_attrs.xml5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index ccde8e2ba..71ea584c9 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -487,7 +487,10 @@ sub buildHierarchy
{
my $val=$settingptr->{$key}->{property}->
{$prop}->{value};
- $self->setAttribute($key, $prop, $val);
+ if ($val ne "")
+ {
+ $self->setAttribute($key, $prop, $val);
+ }
}
## Save busses
diff --git a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
index 06ae76b99..3d6f3874f 100644
--- a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
+++ b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
@@ -669,6 +669,11 @@
</attribute>
<attribute>
+ <id>ATTR_PBAX_GROUPID</id>
+ <global/>
+ </attribute>
+
+ <attribute>
<id>CEN_MSS_CACHE_ENABLE</id>
<no_export/>
<default>0x1</default>
OpenPOWER on IntegriCloud