projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
include
/
asm-powerpc
/
eeh_event.h
diff --git
a/include/asm-powerpc/eeh_event.h
b/include/asm-powerpc/eeh_event.h
index
d168a30
..
dc6bf0f
100644
(file)
--- a/
include/asm-powerpc/eeh_event.h
+++ b/
include/asm-powerpc/eeh_event.h
@@
-18,8
+18,9
@@
* Copyright (c) 2005 Linas Vepstas <linas@linas.org>
*/
* Copyright (c) 2005 Linas Vepstas <linas@linas.org>
*/
-#ifndef ASM_PPC64_EEH_EVENT_H
-#define ASM_PPC64_EEH_EVENT_H
+#ifndef ASM_POWERPC_EEH_EVENT_H
+#define ASM_POWERPC_EEH_EVENT_H
+#ifdef __KERNEL__
/** EEH event -- structure holding pci controller data that describes
* a change in the isolation status of a PCI slot. A pointer
/** EEH event -- structure holding pci controller data that describes
* a change in the isolation status of a PCI slot. A pointer
@@
-29,7
+30,7
@@
struct eeh_event {
struct list_head list;
struct device_node *dn; /* struct device node */
struct pci_dev *dev; /* affected device */
struct list_head list;
struct device_node *dn; /* struct device node */
struct pci_dev *dev; /* affected device */
- int state;
+ enum pci_channel_state state; /* PCI bus state for the affected device */
int time_unavail; /* milliseconds until device might be available */
};
int time_unavail; /* milliseconds until device might be available */
};
@@
-38,7
+39,7
@@
struct eeh_event {
* @dev pci device
*
* This routine builds a PCI error event which will be delivered
* @dev pci device
*
* This routine builds a PCI error event which will be delivered
- * to all listeners on the
p
eh_notifier_chain.
+ * to all listeners on the
e
eh_notifier_chain.
*
* This routine can be called within an interrupt context;
* the actual event will be delivered in a normal context
*
* This routine can be called within an interrupt context;
* the actual event will be delivered in a normal context
@@
-46,7
+47,11
@@
struct eeh_event {
*/
int eeh_send_failure_event (struct device_node *dn,
struct pci_dev *dev,
*/
int eeh_send_failure_event (struct device_node *dn,
struct pci_dev *dev,
-
int reset_
state,
+
enum pci_channel_state
state,
int time_unavail);
int time_unavail);
-#endif /* ASM_PPC64_EEH_EVENT_H */
+/* Main recovery function */
+struct pci_dn * handle_eeh_events (struct eeh_event *);
+
+#endif /* __KERNEL__ */
+#endif /* ASM_POWERPC_EEH_EVENT_H */