|
@@ -254,24 +254,26 @@ static void __init pseries_discover_pic(void)
|
|
|
static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *data)
|
|
static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *data)
|
|
|
{
|
|
{
|
|
|
struct of_reconfig_data *rd = data;
|
|
struct of_reconfig_data *rd = data;
|
|
|
- struct device_node *np = rd->dn;
|
|
|
|
|
- struct pci_dn *pci = NULL;
|
|
|
|
|
|
|
+ struct device_node *parent, *np = rd->dn;
|
|
|
|
|
+ struct pci_dn *pdn;
|
|
|
int err = NOTIFY_OK;
|
|
int err = NOTIFY_OK;
|
|
|
|
|
|
|
|
switch (action) {
|
|
switch (action) {
|
|
|
case OF_RECONFIG_ATTACH_NODE:
|
|
case OF_RECONFIG_ATTACH_NODE:
|
|
|
- pci = np->parent->data;
|
|
|
|
|
- if (pci) {
|
|
|
|
|
- update_dn_pci_info(np, pci->phb);
|
|
|
|
|
-
|
|
|
|
|
- /* Create EEH device for the OF node */
|
|
|
|
|
- eeh_dev_init(PCI_DN(np), pci->phb);
|
|
|
|
|
|
|
+ parent = of_get_parent(np);
|
|
|
|
|
+ pdn = parent ? PCI_DN(parent) : NULL;
|
|
|
|
|
+ if (pdn) {
|
|
|
|
|
+ /* Create pdn and EEH device */
|
|
|
|
|
+ update_dn_pci_info(np, pdn->phb);
|
|
|
|
|
+ eeh_dev_init(PCI_DN(np), pdn->phb);
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ of_node_put(parent);
|
|
|
break;
|
|
break;
|
|
|
case OF_RECONFIG_DETACH_NODE:
|
|
case OF_RECONFIG_DETACH_NODE:
|
|
|
- pci = PCI_DN(np);
|
|
|
|
|
- if (pci)
|
|
|
|
|
- list_del(&pci->list);
|
|
|
|
|
|
|
+ pdn = PCI_DN(np);
|
|
|
|
|
+ if (pdn)
|
|
|
|
|
+ list_del(&pdn->list);
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
|
err = NOTIFY_DONE;
|
|
err = NOTIFY_DONE;
|