| Message ID | ac861431c98e0c259fec18a0d220994ad6b362ae.1527217866.git.sbobroff@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 796b9f5b317a46d1b744f661c38a62b1280a6ab7 |
| Headers | show |
| Series | EEH refactoring 2 | expand |
On Fri, 2018-05-25 at 03:11:28 UTC, Sam Bobroff wrote: > The current failure message includes the number of failures that have > occurred in the last hour (for a device) but it does not indicate > how many failures will be tolerated before the device is permanently > disabled. > > Include the limit (eeh_max_freezes) to make this less surprising when > it happens. > > Also remove the embedded newline from the existing message to make it > easier to grep for. > > Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/796b9f5b317a46d1b744f661c38a62 cheers
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index b8a329f04814..56a60b9eb397 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -778,14 +778,13 @@ void eeh_handle_normal_event(struct eeh_pe *pe) eeh_pe_update_time_stamp(pe); pe->freeze_count++; if (pe->freeze_count > eeh_max_freezes) { - pr_err("EEH: PHB#%x-PE#%x has failed %d times in the\n" - "last hour and has been permanently disabled.\n", + pr_err("EEH: PHB#%x-PE#%x has failed %d times in the last hour and has been permanently disabled.\n", pe->phb->global_number, pe->addr, pe->freeze_count); goto hard_fail; } - pr_warn("EEH: This PCI device has failed %d times in the last hour\n", - pe->freeze_count); + pr_warn("EEH: This PCI device has failed %d times in the last hour and will be permanently disabled after %d failures.\n", + pe->freeze_count, eeh_max_freezes); /* Walk the various device drivers attached to this slot through * a reset sequence, giving each an opportunity to do what it needs
The current failure message includes the number of failures that have occurred in the last hour (for a device) but it does not indicate how many failures will be tolerated before the device is permanently disabled. Include the limit (eeh_max_freezes) to make this less surprising when it happens. Also remove the embedded newline from the existing message to make it easier to grep for. Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- arch/powerpc/kernel/eeh_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)