openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] ppc64: Fix add notifier crashes 

The extraction of PCI stuff from struct device_node left some false
assumptions in notifier code.  As a result, dynamic add crashes when
non-PCI nodes are added.  This patch fixes these assumptions.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
John Rose 2005-11-02 10:29:55 -06:00 committed by Paul Mackerras
parent f4fcbbe9a7
commit 8902e87f1f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/pseries/iommu.c
View File

@ -498,7 +498,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
switch (action) { switch (action) {
case PSERIES_RECONFIG_REMOVE: case PSERIES_RECONFIG_REMOVE:
if (pci->iommu_table && if (pci && pci->iommu_table &&
get_property(np, "ibm,dma-window", NULL)) get_property(np, "ibm,dma-window", NULL))
iommu_free_table(np); iommu_free_table(np);
break; break;

5
arch/ppc64/kernel/pci_dn.c
View File

@ -181,13 +181,14 @@ EXPORT_SYMBOL(fetch_dev_dn);
static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node) static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
{ {
struct device_node *np = node; struct device_node *np = node;
struct pci_dn *pci; struct pci_dn *pci = NULL;
int err = NOTIFY_OK; int err = NOTIFY_OK;
switch (action) { switch (action) {
case PSERIES_RECONFIG_ADD: case PSERIES_RECONFIG_ADD:
pci = np->parent->data; pci = np->parent->data;
update_dn_pci_info(np, pci->phb); if (pci)
update_dn_pci_info(np, pci->phb);
break; break;
default: default:
err = NOTIFY_DONE; err = NOTIFY_DONE;