Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90375f53960f2b1e8d2a6af3324d440e3a977bf3
Commit: 90375f53960f2b1e8d2a6af3324d440e3a977bf3
Parent: 5794dbcbab862e416c4ea4f10fda5e67f5565fd7
Author: Linas Vepstas <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 19 14:56:43 2007 -0500
Committer: Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Mar 22 22:52:54 2007 +1100
[POWERPC] EEH: handle reset state high
Some firmware versions will return a slot reset state of "1"
when a slot is EEH frozen. Recognize this as a state that can be
handled.
Signed-off-by: Linas Vepstas <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
arch/powerpc/platforms/pseries/eeh.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/eeh.c
b/arch/powerpc/platforms/pseries/eeh.c
index 44aae91..cb8a151 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -386,7 +386,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct
pci_dev *dev)
}
/* If not the kind of error we know about, punt. */
- if (rets[0] != 2 && rets[0] != 4 && rets[0] != 5) {
+ if (rets[0] != 1 && rets[0] != 2 && rets[0] != 4 && rets[0] != 5) {
false_positives++;
rc = 0;
goto dn_unlock;
@@ -401,7 +401,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct
pci_dev *dev)
spin_unlock_irqrestore(&confirm_error_lock, flags);
state = pci_channel_io_normal;
- if ((rets[0] == 2) || (rets[0] == 4))
+ if ((rets[0] == 1) || (rets[0] == 2) || (rets[0] == 4))
state = pci_channel_io_frozen;
if (rets[0] == 5)
state = pci_channel_io_perm_failure;
@@ -410,7 +410,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct
pci_dev *dev)
/* Most EEH events are due to device driver bugs. Having
* a stack trace will help the device-driver authors figure
* out what happened. So print that out. */
- if (rets[0] != 5) dump_stack();
+ dump_stack();
return 1;
dn_unlock:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
