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

Commit 39d16e29 authored by Linas Vepstas's avatar Linas Vepstas Committed by Paul Mackerras
Browse files

[POWERPC] EEH: modify order of EEH state checking 



Change the order in which pci error state is examined;
the "capabilites" is not valid if "reset state" is 5.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e91948fd

arch/powerpc/platforms/pseries/eeh.c

+8 −8
Original line number Diff line number Diff line
@@ -367,6 +367,14 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev) 
		goto dn_unlock;

	}



	/* Note that config-io to empty slots may fail;

	 * they are empty when they don't have children. */

	if ((rets[0] == 5) && (dn->child == NULL)) {

		false_positives++;

		rc = 0;

		goto dn_unlock;

	}



	/* If EEH is not supported on this device, punt. */

	if (rets[1] != 1) {

		printk(KERN_WARNING "EEH: event on unsupported device, rc=%d dn=%s\n",
@@ -383,14 +391,6 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev) 
		goto dn_unlock;

	}



	/* Note that config-io to empty slots may fail;

	 * we recognize empty because they don't have children. */

	if ((rets[0] == 5) && (dn->child == NULL)) {

		false_positives++;

		rc = 0;

		goto dn_unlock;

	}



	slot_resets++;

 

	/* Avoid repeated reports of this failure, including problems