aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/eeh.h
diff options
context:
space:
mode:
authorJohn Rose <johnrose@austin.ibm.com>2006-02-24 12:34:23 -0500
committerPaul Mackerras <paulus@samba.org>2006-02-28 00:25:54 -0500
commit827c1a6c1a5dcb2902fecfb648f9af6a532934eb (patch)
tree7cc96f3b3df746dc8569bc1b0bffd47f11084214 /include/asm-powerpc/eeh.h
parenta8b76b491510b7591c584838d0d7922f9ffe5c2c (diff)
[PATCH] powerpc: fix dynamic PCI probe regression
Some hotplug driver functions were migrated to the kernel for use by EEH in commit 2bf6a8fa21570f37fd1789610da30f70a05ac5e3. Previously, the PCI Hotplug module had been changed to use the new OFDT-based PCI probe when appropriate: 5fa80fcdca9d20d30c9ecec30d4dbff4ed93a5c6 When rpaphp_pci_config_slot() was moved from the rpaphp driver to the new kernel function pcibios_add_pci_devices(), the OFDT-based probe stuff was dropped. This patch restores it. Signed-off-by: John Rose <johnrose@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/eeh.h')
-rw-r--r--include/asm-powerpc/eeh.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asm-powerpc/eeh.h b/include/asm-powerpc/eeh.h
index b263fb2fa6e4..7dfb408fe2ca 100644
--- a/include/asm-powerpc/eeh.h
+++ b/include/asm-powerpc/eeh.h
@@ -27,6 +27,7 @@
27#include <linux/string.h> 27#include <linux/string.h>
28 28
29struct pci_dev; 29struct pci_dev;
30struct pci_bus;
30struct device_node; 31struct device_node;
31 32
32#ifdef CONFIG_EEH 33#ifdef CONFIG_EEH
@@ -61,7 +62,7 @@ void __init pci_addr_cache_build(void);
61 */ 62 */
62void eeh_add_device_early(struct device_node *); 63void eeh_add_device_early(struct device_node *);
63void eeh_add_device_tree_early(struct device_node *); 64void eeh_add_device_tree_early(struct device_node *);
64void eeh_add_device_late(struct pci_dev *); 65void eeh_add_device_tree_late(struct pci_bus *);
65 66
66/** 67/**
67 * eeh_remove_device - undo EEH setup for the indicated pci device 68 * eeh_remove_device - undo EEH setup for the indicated pci device
@@ -116,12 +117,12 @@ static inline void pci_addr_cache_build(void) { }
116 117
117static inline void eeh_add_device_early(struct device_node *dn) { } 118static inline void eeh_add_device_early(struct device_node *dn) { }
118 119
119static inline void eeh_add_device_late(struct pci_dev *dev) { }
120
121static inline void eeh_remove_device(struct pci_dev *dev) { } 120static inline void eeh_remove_device(struct pci_dev *dev) { }
122 121
123static inline void eeh_add_device_tree_early(struct device_node *dn) { } 122static inline void eeh_add_device_tree_early(struct device_node *dn) { }
124 123
124static inline void eeh_add_device_tree_late(struct pci_bus *bus) { }
125
125static inline void eeh_remove_bus_device(struct pci_dev *dev) { } 126static inline void eeh_remove_bus_device(struct pci_dev *dev) { }
126#define EEH_POSSIBLE_ERROR(val, type) (0) 127#define EEH_POSSIBLE_ERROR(val, type) (0)
127#define EEH_IO_ERROR_VALUE(size) (-1UL) 128#define EEH_IO_ERROR_VALUE(size) (-1UL)