summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2018-02-06 11:17:04 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-02-07 16:29:21 -0500
commit29b02eface8422e47d7909f24377594b83bc9029 (patch)
tree45306bb70235d20178412c142484517004827fa9 /src/usr
parent1959b18ec67778b691579a83f2f0de77fd7b787f (diff)
downloadblackbird-hostboot-29b02eface8422e47d7909f24377594b83bc9029.tar.gz
blackbird-hostboot-29b02eface8422e47d7909f24377594b83bc9029.zip
Always set RISK_LEVEL regardless of value
Fixing a bug where we only set ATTR_RISK_LEVEL if the value is non-zero. This leads to cases where we cannot clear the value once we set it. I also changed the persistency of ATTR_RISK_LEVEL so that it doesn't persist across boots since it will always be set to a new value during each boot. Change-Id: I9df1e505755f860524a3b1af46c68f315f142066 CQ: SW415934 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53451 Reviewed-by: Dean Sanner <dsanner@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.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: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/targeting/common/xmltohb/hb_customized_attrs.xml3
-rwxr-xr-xsrc/usr/targeting/targetservicestart.C5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
index 2effacb68..f517f8cc4 100644
--- a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
+++ b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
@@ -572,9 +572,12 @@
<writeable/>
</attribute>
+ <!-- FSP always reads a registry key and set this on each boot,
+ HB always reads the data from the scratch reg and sets it -->
<attribute>
<id>ATTR_RISK_LEVEL</id>
<writeable/>
+ <persistency>volatile-zeroed</persistency>
</attribute>
<attribute>
diff --git a/src/usr/targeting/targetservicestart.C b/src/usr/targeting/targetservicestart.C
index 360df2b8e..f55959f95 100755
--- a/src/usr/targeting/targetservicestart.C
+++ b/src/usr/targeting/targetservicestart.C
@@ -378,10 +378,7 @@ static void initializeAttributes(TargetService& i_targetService,
//Set the RISK_LEVEL ATTR based off of master Scratch regs
INITSERVICE::SPLESS::MboxScratch5_t l_scratch5;
l_scratch5.data32 = i_masterScratch[INITSERVICE::SPLESS::SCRATCH_5];
- if(l_scratch5.riskLevel)
- {
- l_pTopLevel->setAttr<ATTR_RISK_LEVEL>(1);
- }
+ l_pTopLevel->setAttr<ATTR_RISK_LEVEL>(l_scratch5.riskLevel);
}
if(i_isMpipl)
OpenPOWER on IntegriCloud