Skip to content

Commit

Permalink
powerpc/eeh: Reorder output messages
Browse files Browse the repository at this point in the history
We already had some output messages from EEH core. Occasionally,
we can see the output messages from EEH core before the stack
dump. That's not what we expected. The patch fixes that and shows
the stack dump prior to output messages from EEH core.

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Gavin Shan authored and Benjamin Herrenschmidt committed Oct 11, 2013
1 parent 8c6852e commit 5293bf9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/kernel/eeh.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ static int eeh_phb_check_failure(struct eeh_pe *pe)
/* Isolate the PHB and send event */
eeh_pe_state_mark(phb_pe, EEH_PE_ISOLATED);
eeh_serialize_unlock(flags);
eeh_send_failure_event(phb_pe);

pr_err("EEH: PHB#%x failure detected\n",
phb_pe->phb->global_number);
dump_stack();
eeh_send_failure_event(phb_pe);

return 1;
out:
Expand Down Expand Up @@ -454,8 +454,6 @@ int eeh_dev_check_failure(struct eeh_dev *edev)
eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
eeh_serialize_unlock(flags);

eeh_send_failure_event(pe);

/* Most EEH events are due to device driver bugs. Having
* a stack trace will help the device-driver authors figure
* out what happened. So print that out.
Expand All @@ -464,6 +462,8 @@ int eeh_dev_check_failure(struct eeh_dev *edev)
pe->addr, pe->phb->global_number);
dump_stack();

eeh_send_failure_event(pe);

return 1;

dn_unlock:
Expand Down

0 comments on commit 5293bf9

Please sign in to comment.