Skip to content

Commit

Permalink
Enable the inband Explorer update
Browse files Browse the repository at this point in the history
OCMB_FW_UPDATE_OVERRIDE needs to be set to 0 for real hw.
0 = CHECK_VERSIONS - compare actual and desired versions,
update if they do not match
Currently was set to PREVENT_UPDATE (skip checking versions too)

Change-Id: Ibe55038085e2a66462e7a1275aa98e4de8bdfb84
RTC:244420
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/94030
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: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Reviewed-by: Nicholas E Bofferding <bofferdn@us.ibm.com>
  • Loading branch information
mderkse1 authored and Nicholas E Bofferding committed Mar 27, 2020
1 parent 81fe481 commit 27e689c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
8 changes: 8 additions & 0 deletions src/usr/isteps/expupd/expupd.C
Expand Up @@ -36,11 +36,13 @@
#include <fapi2/hw_access.H>
#include <chipids.H>
#include <trace/interface.H>
#include <util/misc.H>
#include <hbotcompid.H>
#include "ocmbFwImage.H"
#include <exp_fw_update.H>
#include <initservice/istepdispatcherif.H>


using namespace ISTEP_ERROR;
using namespace ERRORLOG;
using namespace TARGETING;
Expand Down Expand Up @@ -154,6 +156,12 @@ void updateAll(IStepError& o_stepError)
auto l_forced_behavior =
l_pTopLevel->getAttr<TARGETING::ATTR_OCMB_FW_UPDATE_OVERRIDE>();

if ( Util::isSimicsRunning() )
{
TRACFCOMP(g_trac_expupd, INFO_MRK "Simics running so just do the version check");
l_forced_behavior = TARGETING::OCMB_FW_UPDATE_BEHAVIOR_CHECK_BUT_NO_UPDATE;
}

// Exit now if told to
if( TARGETING::OCMB_FW_UPDATE_BEHAVIOR_PREVENT_UPDATE
== l_forced_behavior )
Expand Down
9 changes: 3 additions & 6 deletions src/usr/targeting/common/xmltohb/attribute_types.xml
Expand Up @@ -5592,15 +5592,12 @@
Force specific behavior for the OCMB Firmware update function.
</description>
<id>OCMB_FW_UPDATE_OVERRIDE</id>
<!-- @fixme-RTC:244420-Should be volatile-zero -->
<persistency>volatile</persistency>
<persistency>volatile-zeroed</persistency>
<readable/>
<simpleType>
<uint8_t>
<!-- Cannot use enumeration directly due to override issue -->
<default>2</default>
</uint8_t>
<uint8_t/>
</simpleType>
<no_export/>
</attribute>

<attribute>
Expand Down

0 comments on commit 27e689c

Please sign in to comment.