Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 432227e9 authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/eeh: Introduce flag EEH_PE_REMOVED 



The conditions that one specific PE's frozen count exceeds the maximal
allowed times (EEH_MAX_ALLOWED_FREEZES) and it's in isolated or recovery
state indicate the PE was removed permanently implicitly. The patch
introduces flag EEH_PE_REMOVED to indicate that explicitly so that we
don't depend on the fixed maximal allowed times, which can be varied as
we do in subsequent patch.

Flag EEH_PE_REMOVED is expected to be marked for the PE whose frozen
count exceeds the maximal allowed times, or just failed from recovery.

Requested-by: default avatarRyan Grimm <grimm@linux.vnet.ibm.com>
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2aa5cf9e

arch/powerpc/include/asm/eeh.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct device_node; 


#define EEH_PE_KEEP		(1 << 8)	/* Keep PE on hotplug	*/

#define EEH_PE_CFG_RESTRICTED	(1 << 9)	/* Block config on error */

#define EEH_PE_REMOVED		(1 << 10)	/* Removed permanently	*/



struct eeh_pe {

	int type;			/* PE type: PHB/Bus/Device	*/

arch/powerpc/kernel/eeh_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ static void eeh_handle_normal_event(struct eeh_pe *pe) 
	eeh_pe_dev_traverse(pe, eeh_report_failure, NULL);



	/* Mark the PE to be removed permanently */

	pe->freeze_count = EEH_MAX_ALLOWED_FREEZES + 1;

	eeh_pe_state_mark(pe, EEH_PE_REMOVED);



	/*

	 * Shut down the device drivers for good. We mark

arch/powerpc/kernel/eeh_pe.c

+2 −4
Original line number Diff line number Diff line
@@ -526,8 +526,7 @@ static void *__eeh_pe_state_mark(void *data, void *flag) 
	struct pci_dev *pdev;



	/* Keep the state of permanently removed PE intact */

	if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) &&

	    (state & (EEH_PE_ISOLATED | EEH_PE_RECOVERING)))

	if (pe->state & EEH_PE_REMOVED)

		return NULL;



	pe->state |= state;
@@ -600,8 +599,7 @@ static void *__eeh_pe_state_clear(void *data, void *flag) 
	struct pci_dev *pdev;



	/* Keep the state of permanently removed PE intact */

	if ((pe->freeze_count > EEH_MAX_ALLOWED_FREEZES) &&

	    (state & EEH_PE_ISOLATED))

	if (pe->state & EEH_PE_REMOVED)

		return NULL;



	pe->state &= ~state;