Commit cf1d469e authored by Tony Luck's avatar Tony Luck

Pull mca-check-psp into release branch

parents 64de57ff a14f25a0
...@@ -547,9 +547,20 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, ...@@ -547,9 +547,20 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
(pal_processor_state_info_t*)peidx_psp(peidx); (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; return 0;
/* /*
...@@ -570,8 +581,6 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, ...@@ -570,8 +581,6 @@ recover_from_processor_error(int platform, slidx_table_t *slidx,
return 0; return 0;
if (pbci->eb && pbci->bsi > 0) if (pbci->eb && pbci->bsi > 0)
return 0; return 0;
if (psp->ci == 0)
return 0;
/* /*
* This is a local MCA and estimated as recoverble external bus error. * This is a local MCA and estimated as recoverble external bus error.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment