[1/1] powerpc/eeh: differentiate duplicate detection message
diff mbox series

Message ID 43817cb6e6631b0828b9a6e266f60d1f8ca8eb22.1571288375.git.sbobroff@linux.ibm.com
State Accepted
Commit de84ffc3ccbeec3678f95a3d898fc188efa0d9c5
Headers show
Series
  • [1/1] powerpc/eeh: differentiate duplicate detection message
Related show

Checks

Context Check Description
snowpatch_ozlabs/checkpatch warning total: 0 errors, 0 warnings, 1 checks, 14 lines checked
snowpatch_ozlabs/build-pmac32 success Build succeeded
snowpatch_ozlabs/build-ppc64e success Build succeeded
snowpatch_ozlabs/build-ppc64be success Build succeeded
snowpatch_ozlabs/build-ppc64le success Build succeeded
snowpatch_ozlabs/apply_patch success Successfully applied on branch next (600802af9049be799465b24d14162918545634bf)

Commit Message

Sam Bobroff Oct. 17, 2019, 4:59 a.m. UTC
Currently when an EEH error is detected, the system log receives the
same (or almost the same) message twice:

EEH: PHB#0 failure detected, location: N/A
EEH: PHB#0 failure detected, location: N/A
or
EEH: eeh_dev_check_failure: Frozen PHB#0-PE#0 detected
EEH: Frozen PHB#0-PE#0 detected

This looks like a bug, but in fact the messages are from different
functions and mean slightly different things.  So keep both but change
one of the messages slightly, so that it's clear they are different:

EEH: PHB#0 failure detected, location: N/A
EEH: Recovering PHB#0, location: N/A
or
EEH: eeh_dev_check_failure: Frozen PHB#0-PE#0 detected
EEH: Recovering PHB#0-PE#0

Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>
---
 arch/powerpc/kernel/eeh_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Ellerman Nov. 14, 2019, 9:07 a.m. UTC | #1
On Thu, 2019-10-17 at 04:59:37 UTC, Sam Bobroff wrote:
> Currently when an EEH error is detected, the system log receives the
> same (or almost the same) message twice:
> 
> EEH: PHB#0 failure detected, location: N/A
> EEH: PHB#0 failure detected, location: N/A
> or
> EEH: eeh_dev_check_failure: Frozen PHB#0-PE#0 detected
> EEH: Frozen PHB#0-PE#0 detected
> 
> This looks like a bug, but in fact the messages are from different
> functions and mean slightly different things.  So keep both but change
> one of the messages slightly, so that it's clear they are different:
> 
> EEH: PHB#0 failure detected, location: N/A
> EEH: Recovering PHB#0, location: N/A
> or
> EEH: eeh_dev_check_failure: Frozen PHB#0-PE#0 detected
> EEH: Recovering PHB#0-PE#0
> 
> Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com>

Series applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/de84ffc3ccbeec3678f95a3d898fc188efa0d9c5

cheers

Patch
diff mbox series

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index d9279d0ee9f5..c031be8d41ff 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -897,12 +897,12 @@  void eeh_handle_normal_event(struct eeh_pe *pe)
 
 	/* Log the event */
 	if (pe->type & EEH_PE_PHB) {
-		pr_err("EEH: PHB#%x failure detected, location: %s\n",
+		pr_err("EEH: Recovering PHB#%x, location: %s\n",
 			pe->phb->global_number, eeh_pe_loc_get(pe));
 	} else {
 		struct eeh_pe *phb_pe = eeh_phb_pe_get(pe->phb);
 
-		pr_err("EEH: Frozen PHB#%x-PE#%x detected\n",
+		pr_err("EEH: Recovering PHB#%x-PE#%x\n",
 		       pe->phb->global_number, pe->addr);
 		pr_err("EEH: PE location: %s, PHB location: %s\n",
 		       eeh_pe_loc_get(pe), eeh_pe_loc_get(phb_pe));