powerpc/eeh: Remove EEH_PE_PHB_DEAD
The PE state (for eeh_pe instance) EEH_PE_PHB_DEAD is duplicate to EEH_PE_ISOLATED. Originally, those PHBs (PHB PE) with EEH_PE_PHB_DEAD would be removed from the system. However, it's safe to replace that with EEH_PE_ISOLATED. The patch also clear EEH_PE_RECOVERING after fenced PHB has been handled, either failure or success. It makes the PHB PE state consistent with: PHB functions normally NONE PHB has been removed EEH_PE_ISOLATED PHB fenced, recovery in progress EEH_PE_ISOLATED | RECOVERING Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:

committed by
Benjamin Herrenschmidt

parent
e4565362c7
commit
9e04937560
@@ -682,8 +682,7 @@ static void eeh_handle_special_event(void)
|
||||
phb_pe = eeh_phb_pe_get(hose);
|
||||
if (!phb_pe) continue;
|
||||
|
||||
eeh_pe_state_mark(phb_pe,
|
||||
EEH_PE_ISOLATED | EEH_PE_PHB_DEAD);
|
||||
eeh_pe_state_mark(phb_pe, EEH_PE_ISOLATED);
|
||||
}
|
||||
|
||||
eeh_serialize_unlock(flags);
|
||||
@@ -699,8 +698,7 @@ static void eeh_handle_special_event(void)
|
||||
eeh_remove_event(pe);
|
||||
|
||||
if (rc == EEH_NEXT_ERR_DEAD_PHB)
|
||||
eeh_pe_state_mark(pe,
|
||||
EEH_PE_ISOLATED | EEH_PE_PHB_DEAD);
|
||||
eeh_pe_state_mark(pe, EEH_PE_ISOLATED);
|
||||
else
|
||||
eeh_pe_state_mark(pe,
|
||||
EEH_PE_ISOLATED | EEH_PE_RECOVERING);
|
||||
@@ -724,12 +722,14 @@ static void eeh_handle_special_event(void)
|
||||
if (rc == EEH_NEXT_ERR_FROZEN_PE ||
|
||||
rc == EEH_NEXT_ERR_FENCED_PHB) {
|
||||
eeh_handle_normal_event(pe);
|
||||
eeh_pe_state_clear(pe, EEH_PE_RECOVERING);
|
||||
} else {
|
||||
pci_lock_rescan_remove();
|
||||
list_for_each_entry(hose, &hose_list, list_node) {
|
||||
phb_pe = eeh_phb_pe_get(hose);
|
||||
if (!phb_pe ||
|
||||
!(phb_pe->state & EEH_PE_PHB_DEAD))
|
||||
!(phb_pe->state & EEH_PE_ISOLATED) ||
|
||||
(phb_pe->state & EEH_PE_RECOVERING))
|
||||
continue;
|
||||
|
||||
/* Notify all devices to be down */
|
||||
|
Reference in New Issue
Block a user