Patch "powerpc/eeh: differentiate duplicate detection message" has been added to the 5.4-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    powerpc/eeh: differentiate duplicate detection message

to the 5.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc-eeh-differentiate-duplicate-detection-messag.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8bebd0052740e024c3c8cb41e56202bcade0b9c2
Author: Sam Bobroff <sbobroff@xxxxxxxxxxxxx>
Date:   Thu Oct 17 15:59:37 2019 +1100

    powerpc/eeh: differentiate duplicate detection message
    
    [ Upstream commit de84ffc3ccbeec3678f95a3d898fc188efa0d9c5 ]
    
    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@xxxxxxxxxxxxx>
    Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/43817cb6e6631b0828b9a6e266f60d1f8ca8eb22.1571288375.git.sbobroff@xxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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));