aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/pseries/eeh.c2
-rw-r--r--arch/powerpc/platforms/pseries/eeh_driver.c13
-rw-r--r--include/asm-powerpc/ppc-pci.h3
3 files changed, 4 insertions, 14 deletions
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index be981407525..d9662688c8b 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -172,7 +172,7 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
172/** 172/**
173 * Return the "partitionable endpoint" (pe) under which this device lies 173 * Return the "partitionable endpoint" (pe) under which this device lies
174 */ 174 */
175static struct device_node * find_device_pe(struct device_node *dn) 175struct device_node * find_device_pe(struct device_node *dn)
176{ 176{
177 while ((dn->parent) && PCI_DN(dn->parent) && 177 while ((dn->parent) && PCI_DN(dn->parent) &&
178 (PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) { 178 (PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index f6cff065d89..199a3ce5478 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -42,19 +42,6 @@ static inline const char * pcid_name (struct pci_dev *pdev)
42 return ""; 42 return "";
43} 43}
44 44
45/**
46 * Return the "partitionable endpoint" (pe) under which this device lies
47 */
48static struct device_node * find_device_pe(struct device_node *dn)
49{
50 while ((dn->parent) && PCI_DN(dn->parent) &&
51 (PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
52 dn = dn->parent;
53 }
54 return dn;
55}
56
57
58#ifdef DEBUG 45#ifdef DEBUG
59static void print_device_node_tree (struct pci_dn *pdn, int dent) 46static void print_device_node_tree (struct pci_dn *pdn, int dent)
60{ 47{
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index 79239a200f1..4820b368bf1 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -109,6 +109,9 @@ int rtas_write_config(struct pci_dn *, int where, int size, u32 val);
109void eeh_mark_slot (struct device_node *dn, int mode_flag); 109void eeh_mark_slot (struct device_node *dn, int mode_flag);
110void eeh_clear_slot (struct device_node *dn, int mode_flag); 110void eeh_clear_slot (struct device_node *dn, int mode_flag);
111 111
112/* Find the associated "Partiationable Endpoint" PE */
113struct device_node * find_device_pe(struct device_node *dn);
114
112#endif 115#endif
113 116
114#endif /* __KERNEL__ */ 117#endif /* __KERNEL__ */