Skip to content

Commit

Permalink
Pull mca-check-psp into release branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony Luck committed Nov 10, 2005
2 parents 64de57f + a14f25a commit cf1d469
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions arch/ia64/kernel/mca_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,20 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
(pal_processor_state_info_t*)peidx_psp(peidx);

/*
* We cannot recover errors with other than bus_check.
* Processor recovery status must key off of the PAL recovery
* status in the Processor State Parameter.
*/
if (psp->cc || psp->rc || psp->uc)

/*
* The machine check is corrected.
*/
if (psp->cm == 1)
return 1;

/*
* The error was not contained. Software must be reset.
*/
if (psp->us || psp->ci == 0)
return 0;

/*
Expand All @@ -570,8 +581,6 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
return 0;
if (pbci->eb && pbci->bsi > 0)
return 0;
if (psp->ci == 0)
return 0;

/*
* This is a local MCA and estimated as recoverble external bus error.
Expand Down

0 comments on commit cf1d469

Please sign in to comment.