| Message ID | 1455680668-23298-29-git-send-email-gwshan@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
On 02/17/2016 02:44 PM, Gavin Shan wrote: > This implements and exports pci_remove_device_node_info(). It's > used to remove the pdn (struct pci_dn) for the indicated device > node. The function is going to be used by PowerNV PCI hotplug > driver. > > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Kind of strange that there is no such helper for pseries, is there? Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > arch/powerpc/include/asm/pci-bridge.h | 1 + > arch/powerpc/kernel/pci_dn.c | 23 +++++++++++++++++++++++ > 2 files changed, 24 insertions(+) > > diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h > index 72a9d4e..c6310e2 100644 > --- a/arch/powerpc/include/asm/pci-bridge.h > +++ b/arch/powerpc/include/asm/pci-bridge.h > @@ -240,6 +240,7 @@ extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev); > extern void remove_dev_pci_data(struct pci_dev *pdev); > extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, > struct device_node *dn); > +extern void pci_remove_device_node_info(struct device_node *dn); > > static inline int pci_device_from_OF_node(struct device_node *np, > u8 *bus, u8 *devfn) > diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c > index 0a249ff..ce10281 100644 > --- a/arch/powerpc/kernel/pci_dn.c > +++ b/arch/powerpc/kernel/pci_dn.c > @@ -331,6 +331,29 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, > } > EXPORT_SYMBOL_GPL(pci_add_device_node_info); > > +void pci_remove_device_node_info(struct device_node *dn) > +{ > + struct pci_dn *pdn = dn ? PCI_DN(dn) : NULL; > +#ifdef CONFIG_EEH > + struct eeh_dev *edev = pdn_to_eeh_dev(pdn); > + > + if (edev) > + edev->pdn = NULL; > +#endif > + > + if (!pdn) > + return; > + > + WARN_ON(!list_empty(&pdn->child_list)); > + list_del(&pdn->list); > + if (pdn->parent) > + of_node_put(pdn->parent->node); > + > + dn->data = NULL; > + kfree(pdn); > +} > +EXPORT_SYMBOL_GPL(pci_remove_device_node_info); > + > /* > * Traverse a device tree stopping each PCI device in the tree. > * This is done depth first. As each node is processed, a "pre" >
On Tue, Apr 19, 2016 at 03:48:26PM +1000, Alexey Kardashevskiy wrote: >On 02/17/2016 02:44 PM, Gavin Shan wrote: >>This implements and exports pci_remove_device_node_info(). It's >>used to remove the pdn (struct pci_dn) for the indicated device >>node. The function is going to be used by PowerNV PCI hotplug >>driver. >> >>Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > >Kind of strange that there is no such helper for pseries, is there? > I don't find one actually. If you find one, pls let me know, thanks! > >Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > > >>--- >> arch/powerpc/include/asm/pci-bridge.h | 1 + >> arch/powerpc/kernel/pci_dn.c | 23 +++++++++++++++++++++++ >> 2 files changed, 24 insertions(+) >> >>diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h >>index 72a9d4e..c6310e2 100644 >>--- a/arch/powerpc/include/asm/pci-bridge.h >>+++ b/arch/powerpc/include/asm/pci-bridge.h >>@@ -240,6 +240,7 @@ extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev); >> extern void remove_dev_pci_data(struct pci_dev *pdev); >> extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, >> struct device_node *dn); >>+extern void pci_remove_device_node_info(struct device_node *dn); >> >> static inline int pci_device_from_OF_node(struct device_node *np, >> u8 *bus, u8 *devfn) >>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c >>index 0a249ff..ce10281 100644 >>--- a/arch/powerpc/kernel/pci_dn.c >>+++ b/arch/powerpc/kernel/pci_dn.c >>@@ -331,6 +331,29 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, >> } >> EXPORT_SYMBOL_GPL(pci_add_device_node_info); >> >>+void pci_remove_device_node_info(struct device_node *dn) >>+{ >>+ struct pci_dn *pdn = dn ? PCI_DN(dn) : NULL; >>+#ifdef CONFIG_EEH >>+ struct eeh_dev *edev = pdn_to_eeh_dev(pdn); >>+ >>+ if (edev) >>+ edev->pdn = NULL; >>+#endif >>+ >>+ if (!pdn) >>+ return; >>+ >>+ WARN_ON(!list_empty(&pdn->child_list)); >>+ list_del(&pdn->list); >>+ if (pdn->parent) >>+ of_node_put(pdn->parent->node); >>+ >>+ dn->data = NULL; >>+ kfree(pdn); >>+} >>+EXPORT_SYMBOL_GPL(pci_remove_device_node_info); >>+ >> /* >> * Traverse a device tree stopping each PCI device in the tree. >> * This is done depth first. As each node is processed, a "pre" >> > > >-- >Alexey >
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h index 72a9d4e..c6310e2 100644 --- a/arch/powerpc/include/asm/pci-bridge.h +++ b/arch/powerpc/include/asm/pci-bridge.h @@ -240,6 +240,7 @@ extern struct pci_dn *add_dev_pci_data(struct pci_dev *pdev); extern void remove_dev_pci_data(struct pci_dev *pdev); extern struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, struct device_node *dn); +extern void pci_remove_device_node_info(struct device_node *dn); static inline int pci_device_from_OF_node(struct device_node *np, u8 *bus, u8 *devfn) diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 0a249ff..ce10281 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -331,6 +331,29 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, } EXPORT_SYMBOL_GPL(pci_add_device_node_info); +void pci_remove_device_node_info(struct device_node *dn) +{ + struct pci_dn *pdn = dn ? PCI_DN(dn) : NULL; +#ifdef CONFIG_EEH + struct eeh_dev *edev = pdn_to_eeh_dev(pdn); + + if (edev) + edev->pdn = NULL; +#endif + + if (!pdn) + return; + + WARN_ON(!list_empty(&pdn->child_list)); + list_del(&pdn->list); + if (pdn->parent) + of_node_put(pdn->parent->node); + + dn->data = NULL; + kfree(pdn); +} +EXPORT_SYMBOL_GPL(pci_remove_device_node_info); + /* * Traverse a device tree stopping each PCI device in the tree. * This is done depth first. As each node is processed, a "pre"
This implements and exports pci_remove_device_node_info(). It's used to remove the pdn (struct pci_dn) for the indicated device node. The function is going to be used by PowerNV PCI hotplug driver. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/include/asm/pci-bridge.h | 1 + arch/powerpc/kernel/pci_dn.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)