Commit 2c665992 authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt

powerpc/eeh: Clear frozen state for child PE

Since commit cb523e09 ("powerpc/eeh: Avoid I/O access during PE
reset"), the PE is kept as frozen state on hardware level until
the PE reset is done completely. After that, we explicitly clear
the frozen state of the affected PE. However, there might have
frozen child PEs of the affected PE and we also need clear their
frozen state as well. Otherwise, the recovery is going to fail.
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 4817fc32
...@@ -447,8 +447,9 @@ static void *eeh_pe_detach_dev(void *data, void *userdata) ...@@ -447,8 +447,9 @@ static void *eeh_pe_detach_dev(void *data, void *userdata)
* PE reset (for 3 times), we try to clear the frozen state * PE reset (for 3 times), we try to clear the frozen state
* for 3 times as well. * for 3 times as well.
*/ */
static int eeh_clear_pe_frozen_state(struct eeh_pe *pe) static void *__eeh_clear_pe_frozen_state(void *data, void *flag)
{ {
struct eeh_pe *pe = (struct eeh_pe *)data;
int i, rc; int i, rc;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
...@@ -461,13 +462,24 @@ static int eeh_clear_pe_frozen_state(struct eeh_pe *pe) ...@@ -461,13 +462,24 @@ static int eeh_clear_pe_frozen_state(struct eeh_pe *pe)
} }
/* The PE has been isolated, clear it */ /* The PE has been isolated, clear it */
if (rc) if (rc) {
pr_warn("%s: Can't clear frozen PHB#%x-PE#%x (%d)\n", pr_warn("%s: Can't clear frozen PHB#%x-PE#%x (%d)\n",
__func__, pe->phb->global_number, pe->addr, rc); __func__, pe->phb->global_number, pe->addr, rc);
else return (void *)pe;
}
return NULL;
}
static int eeh_clear_pe_frozen_state(struct eeh_pe *pe)
{
void *rc;
rc = eeh_pe_traverse(pe, __eeh_clear_pe_frozen_state, NULL);
if (!rc)
eeh_pe_state_clear(pe, EEH_PE_ISOLATED); eeh_pe_state_clear(pe, EEH_PE_ISOLATED);
return rc; return rc ? -EIO : 0;
} }
/** /**
......
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