summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Raybuck <matthew.raybuck@ibm.com>2019-08-30 09:32:46 -0500
committerDaniel M Crowell <dcrowell@us.ibm.com>2019-09-10 10:47:29 -0500
commit25e1157f54e066dd57321fe91d8630fba9857c64 (patch)
tree215bddb5032de51633079568c77773434b30f18c
parentf88b6bc4a37d3cf1fdf8f9d821ee120f0ceceea5 (diff)
downloadtalos-hostboot-25e1157f54e066dd57321fe91d8630fba9857c64.tar.gz
talos-hostboot-25e1157f54e066dd57321fe91d8630fba9857c64.zip
Fix misleading trace output for BPM attribute overrides
The traces would indicate that the SKIP attribute override was enabled in some circumstances when it wasn't. This could lead to confusion about why BPM updates didn't occur. Change-Id: Ib577d5fe322266b300f622e9c9095e36dc69c5d1 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83122 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: Roland Veloz <rveloz@us.ibm.com> Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/isteps/nvdimm/bpm_update.C30
1 files changed, 24 insertions, 6 deletions
diff --git a/src/usr/isteps/nvdimm/bpm_update.C b/src/usr/isteps/nvdimm/bpm_update.C
index 1baba7fe5..0395991b6 100644
--- a/src/usr/isteps/nvdimm/bpm_update.C
+++ b/src/usr/isteps/nvdimm/bpm_update.C
@@ -969,9 +969,18 @@ errlHndl_t Bpm::runUpdate(BpmFirmwareLidImage i_fwImage,
}
else
{
- TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
- "ATTR_BPM_UPDATE_OVERRIDE set to skip firmware "
- "portion of BPM updates. Skipping Firmware Update...");
+ if (firmwareOverrideFlag == TARGETING::BPM_UPDATE_BEHAVIOR_SKIP_FW)
+ {
+ TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
+ "ATTR_BPM_UPDATE_OVERRIDE set to skip firmware "
+ "portion of BPM updates. Skipping Firmware Update...");
+ }
+ else
+ {
+ TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
+ "Firmware Data on BPM already up-to-date. "
+ "Skipping Firmware Update...");
+ }
}
uint16_t configOverrideFlag = (updateOverride & 0x00FF);
@@ -993,9 +1002,18 @@ errlHndl_t Bpm::runUpdate(BpmFirmwareLidImage i_fwImage,
}
else
{
- TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
- "ATTR_BPM_UPDATE_OVERRIDE set to skip config "
- "portion of BPM updates. Skipping Config Update...");
+ if (configOverrideFlag == TARGETING::BPM_UPDATE_BEHAVIOR_SKIP_CONFIG)
+ {
+ TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
+ "ATTR_BPM_UPDATE_OVERRIDE set to skip config "
+ "portion of BPM updates. Skipping Config Update...");
+ }
+ else
+ {
+ TRACFCOMP(g_trac_bpm, INFO_MRK"Bpm::runUpdate(): "
+ "Configuration Data on BPM already up-to-date. "
+ "Skipping Config Update...");
+ }
}
OpenPOWER on IntegriCloud