Skip to content

Commit

Permalink
Clear out FIR Init parameters after extra PM Resets
Browse files Browse the repository at this point in the history
There are two cases where we do an extra PM reset during boot:
- enabling OCC Xstop Handler
- mpipl

The ATTR_PM_FIRINIT_DONE_ONCE_FLAG value needs to get cleared
out to force the later 'real' use of the PM complex is setup
correctly.

Change-Id: Ibbe8d65bd6668a88a0e933d1144cd2972f0f0340
CQ: SW449953
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69139
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>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
dcrowell77 committed Nov 28, 2018
1 parent 5172324 commit c112438
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/usr/isteps/istep15/host_build_stop_image.C
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ void* host_build_stop_image (void *io_pArgs)

if (l_sys->getAttr<TARGETING::ATTR_IS_MPIPL_HB>())
{
l_errl = HBPM::resetPMAll();
l_errl = HBPM::resetPMAll(HBPM::RESET_AND_CLEAR_ATTRIBUTES);
if(l_errl)
{
//Break out of the do-while loop..
Expand Down
7 changes: 7 additions & 0 deletions src/usr/isteps/pm/occCheckstop.C
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,13 @@ namespace HBOCC
break;
}

// Need to clear out some state variables that get messed up
// during the PM Reset, e.g. the FIR Init flags
l_errl = HBPM::resetPMAll(HBPM::CLEAR_ATTRIBUTES);
if( l_errl )
{
break;
}

} while(0);

Expand Down
4 changes: 4 additions & 0 deletions src/usr/isteps/pm/pm_common.C
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,11 @@ namespace HBPM

if( CLEAR_ATTRIBUTES & i_opt )
{
// Zero out the HOMER vars
(void) convertHomerPhysToVirt( l_procChip, 0 );

// Zero out the FIR save/restore
l_procChip->setAttr<ATTR_PM_FIRINIT_DONE_ONCE_FLAG>(0);
}
}

Expand Down

0 comments on commit c112438

Please sign in to comment.