powerpc+of: Add of node/property notification chain for adds and removes

This patch moves the notification chain for updates to the device tree from the powerpc/pseries code to the base OF code. This makes this functionality available to all architectures. Additionally the notification chain is updated to allow notifications for property add/remove/update. To make this work a pointer to a new struct (of_prop_reconfig) is passed to the routines in the notification chain. The of_prop_reconfig property contains a pointer to the node containing the property and a pointer to the property itself. In the case of property updates, the property pointer refers to the new property. Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

powerpc+of: Add of node/property notification chain for adds and removes
This patch moves the notification chain for updates to the device tree from the powerpc/pseries code to the base OF code. This makes this functionality available to all architectures. Additionally the notification chain is updated to allow notifications for property add/remove/update. To make this work a pointer to a new struct (of_prop_reconfig) is passed to the routines in the notification chain. The of_prop_reconfig property contains a pointer to the node containing the property and a pointer to the property itself. In the case of property updates, the property pointer refers to the new property. Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Nathan Fontenot · Benjamin Herrenschmidt
1 parent f594972083
Showing 12 changed files with 163 additions and 154 deletions Side-by-side Diff
arch/powerpc/include/asm/pSeries_reconfig.h
arch/powerpc/kernel/prom.c
arch/powerpc/platforms/pseries/dlpar.c
arch/powerpc/platforms/pseries/hotplug-cpu.c
arch/powerpc/platforms/pseries/hotplug-memory.c
arch/powerpc/platforms/pseries/iommu.c
arch/powerpc/platforms/pseries/reconfig.c
arch/powerpc/platforms/pseries/setup.c
drivers/crypto/nx/nx-842.c
drivers/crypto/nx/nx.c
drivers/of/base.c
include/linux/of.h
@@ -2,43 +2,11 @@
 #define _PPC64_PSERIES_RECONFIG_H
 #ifdef __KERNEL__
  
-#include <linux/notifier.h>
-
-/*
- * Use this API if your code needs to know about OF device nodes being
- * added or removed on pSeries systems.
- */
-
-#define PSERIES_RECONFIG_ADD		0x0001
-#define PSERIES_RECONFIG_REMOVE		0x0002
-#define PSERIES_DRCONF_MEM_ADD		0x0003
-#define PSERIES_DRCONF_MEM_REMOVE	0x0004
-#define PSERIES_UPDATE_PROPERTY		0x0005
-
-/**
- * pSeries_reconfig_notify - Notifier value structure for OFDT property updates
- *
- * @node: Device tree node which owns the property being updated
- * @property: Updated property
- */
-struct pSeries_reconfig_prop_update {
-	struct device_node *node;
-	struct property *property;
-};
-
 #ifdef CONFIG_PPC_PSERIES
-extern int pSeries_reconfig_notifier_register(struct notifier_block *);
-extern void pSeries_reconfig_notifier_unregister(struct notifier_block *);
-extern int pSeries_reconfig_notify(unsigned long action, void *p);
 /* Not the best place to put this, will be fixed when we move some
  * of the rtas suspend-me stuff to pseries */
 extern void pSeries_coalesce_init(void);
 #else /* !CONFIG_PPC_PSERIES */
-static inline int pSeries_reconfig_notifier_register(struct notifier_block *nb)
-{
-	return 0;
-}
-static inline void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) { }
 static inline void pSeries_coalesce_init(void) { }
 #endif /* CONFIG_PPC_PSERIES */
  
@@ -32,6 +32,7 @@
 #include <linux/debugfs.h>
 #include <linux/irq.h>
 #include <linux/memblock.h>
+#include <linux/of.h>
  
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -49,7 +50,6 @@
 #include <asm/btext.h>
 #include <asm/sections.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
 #include <asm/kexec.h>
 #include <asm/opal.h>
@@ -802,7 +802,7 @@
 	int err;
  
 	switch (action) {
-	case PSERIES_RECONFIG_ADD:
+	case OF_RECONFIG_ATTACH_NODE:
 		err = of_finish_dynamic_node(node);
 		if (err < 0)
 			printk(KERN_ERR "finish_node returned %d\n", err);
@@ -821,7 +821,7 @@
  
 static int __init prom_reconfig_setup(void)
 {
-	return pSeries_reconfig_notifier_register(&prom_reconfig_nb);
+	return of_reconfig_notifier_register(&prom_reconfig_nb);
 }
 __initcall(prom_reconfig_setup);
 #endif
@@ -16,13 +16,13 @@
 #include <linux/spinlock.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include "offline_states.h"
  
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/uaccess.h>
 #include <asm/rtas.h>
-#include <asm/pSeries_reconfig.h>
  
 struct cc_workarea {
 	u32	drc_index;
  
  
  
@@ -262,24 +262,26 @@
 	if (!dn->parent)
 		return -ENOMEM;
  
-	rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn);
+	rc = of_attach_node(dn);
 	if (rc) {
 		printk(KERN_ERR "Failed to add device node %s\n",
 		       dn->full_name);
 		return rc;
 	}
  
-	of_attach_node(dn);
 	of_node_put(dn->parent);
 	return 0;
 }
  
 int dlpar_detach_node(struct device_node *dn)
 {
-	pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn);
-	of_detach_node(dn);
-	of_node_put(dn); /* Must decrement the refcount */
+	int rc;
  
+	rc = of_detach_node(dn);
+	if (rc)
+		return rc;
+
+	of_node_put(dn); /* Must decrement the refcount */
 	return 0;
 }
  
@@ -23,12 +23,12 @@
 #include <linux/delay.h>
 #include <linux/sched.h>	/* for idle_task_exit */
 #include <linux/cpu.h>
+#include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/firmware.h>
 #include <asm/machdep.h>
 #include <asm/vdso_datapage.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/xics.h>
 #include "plpar_wrappers.h"
 #include "offline_states.h"
  
@@ -333,10 +333,10 @@
 	int err = 0;
  
 	switch (action) {
-	case PSERIES_RECONFIG_ADD:
+	case OF_RECONFIG_ATTACH_NODE:
 		err = pseries_add_processor(node);
 		break;
-	case PSERIES_RECONFIG_REMOVE:
+	case OF_RECONFIG_DETACH_NODE:
 		pseries_remove_processor(node);
 		break;
 	}
@@ -399,7 +399,7 @@
  
 	/* Processors can be added/removed only on LPAR */
 	if (firmware_has_feature(FW_FEATURE_LPAR)) {
-		pSeries_reconfig_notifier_register(&pseries_smp_nb);
+		of_reconfig_notifier_register(&pseries_smp_nb);
 		cpu_maps_update_begin();
 		if (cede_offline_enabled && parse_cede_parameters() == 0) {
 			default_offline_state = CPU_STATE_INACTIVE;
@@ -16,7 +16,6 @@
  
 #include <asm/firmware.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/sparsemem.h>
  
 static unsigned long get_memblock_size(void)
  
  
  
  
  
  
  
  
@@ -187,42 +186,69 @@
 	return (ret < 0) ? -EINVAL : 0;
 }
  
-static int pseries_drconf_memory(unsigned long *base, unsigned int action)
+static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
 {
+	struct of_drconf_cell *new_drmem, *old_drmem;
 	unsigned long memblock_size;
-	int rc;
+	u32 entries;
+	u32 *p;
+	int i, rc = -EINVAL;
  
 	memblock_size = get_memblock_size();
 	if (!memblock_size)
 		return -EINVAL;
  
-	if (action == PSERIES_DRCONF_MEM_ADD) {
-		rc = memblock_add(*base, memblock_size);
-		rc = (rc < 0) ? -EINVAL : 0;
-	} else if (action == PSERIES_DRCONF_MEM_REMOVE) {
-		rc = pseries_remove_memblock(*base, memblock_size);
-	} else {
-		rc = -EINVAL;
+	p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
+	if (!p)
+		return -EINVAL;
+
+	/* The first int of the property is the number of lmb's described
+	 * by the property. This is followed by an array of of_drconf_cell
+	 * entries. Get the niumber of entries and skip to the array of
+	 * of_drconf_cell's.
+	 */
+	entries = *p++;
+	old_drmem = (struct of_drconf_cell *)p;
+
+	p = (u32 *)pr->prop->value;
+	p++;
+	new_drmem = (struct of_drconf_cell *)p;
+
+	for (i = 0; i < entries; i++) {
+		if ((old_drmem[i].flags & DRCONF_MEM_ASSIGNED) &&
+		    (!(new_drmem[i].flags & DRCONF_MEM_ASSIGNED))) {
+			rc = pseries_remove_memblock(old_drmem[i].base_addr,
+						     memblock_size);
+			break;
+		} else if ((!(old_drmem[i].flags & DRCONF_MEM_ASSIGNED)) &&
+			   (new_drmem[i].flags & DRCONF_MEM_ASSIGNED)) {
+			rc = memblock_add(old_drmem[i].base_addr,
+					  memblock_size);
+			rc = (rc < 0) ? -EINVAL : 0;
+			break;
+		}
 	}
  
 	return rc;
 }
  
 static int pseries_memory_notifier(struct notifier_block *nb,
-				unsigned long action, void *node)
+				   unsigned long action, void *node)
 {
+	struct of_prop_reconfig *pr;
 	int err = 0;
  
 	switch (action) {
-	case PSERIES_RECONFIG_ADD:
+	case OF_RECONFIG_ATTACH_NODE:
 		err = pseries_add_memory(node);
 		break;
-	case PSERIES_RECONFIG_REMOVE:
+	case OF_RECONFIG_DETACH_NODE:
 		err = pseries_remove_memory(node);
 		break;
-	case PSERIES_DRCONF_MEM_ADD:
-	case PSERIES_DRCONF_MEM_REMOVE:
-		err = pseries_drconf_memory(node, action);
+	case OF_RECONFIG_UPDATE_PROPERTY:
+		pr = (struct of_prop_reconfig *)node;
+		if (!strcmp(pr->prop->name, "ibm,dynamic-memory"))
+			err = pseries_update_drconf_memory(pr);
 		break;
 	}
 	return notifier_from_errno(err);
@@ -235,7 +261,7 @@
 static int __init pseries_memory_hotplug_init(void)
 {
 	if (firmware_has_feature(FW_FEATURE_LPAR))
-		pSeries_reconfig_notifier_register(&pseries_mem_nb);
+		of_reconfig_notifier_register(&pseries_mem_nb);
  
 	return 0;
 }
@@ -36,13 +36,13 @@
 #include <linux/dma-mapping.h>
 #include <linux/crash_dump.h>
 #include <linux/memory.h>
+#include <linux/of.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/iommu.h>
 #include <asm/pci-bridge.h>
 #include <asm/machdep.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/firmware.h>
 #include <asm/tce.h>
 #include <asm/ppc-pci.h>
@@ -1294,7 +1294,7 @@
 	struct direct_window *window;
  
 	switch (action) {
-	case PSERIES_RECONFIG_REMOVE:
+	case OF_RECONFIG_DETACH_NODE:
 		if (pci && pci->iommu_table)
 			iommu_free_table(pci->iommu_table, np->full_name);
  
@@ -1357,7 +1357,7 @@
 	}
  
  
-	pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
+	of_reconfig_notifier_register(&iommu_reconfig_nb);
 	register_memory_notifier(&iommu_mem_nb);
  
 	set_pci_dma_ops(&dma_iommu_ops);
@@ -16,11 +16,11 @@
 #include <linux/notifier.h>
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
+#include <linux/of.h>
  
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/uaccess.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/mmu.h>
  
 /**
@@ -55,28 +55,6 @@
 	return parent;
 }
  
-static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
-
-int pSeries_reconfig_notifier_register(struct notifier_block *nb)
-{
-	return blocking_notifier_chain_register(&pSeries_reconfig_chain, nb);
-}
-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_register);
-
-void pSeries_reconfig_notifier_unregister(struct notifier_block *nb)
-{
-	blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb);
-}
-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_unregister);
-
-int pSeries_reconfig_notify(unsigned long action, void *p)
-{
-	int err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
-						action, p);
-
-	return notifier_to_errno(err);
-}
-
 static int pSeries_reconfig_add_node(const char *path, struct property *proplist)
 {
 	struct device_node *np;
  
@@ -100,13 +78,12 @@
 		goto out_err;
 	}
  
-	err = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, np);
+	err = of_attach_node(np);
 	if (err) {
 		printk(KERN_ERR "Failed to add device node %s\n", path);
 		goto out_err;
 	}
  
-	of_attach_node(np);
 	of_node_put(np->parent);
  
 	return 0;
  
@@ -134,9 +111,7 @@
 		return -EBUSY;
 	}
  
-	pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, np);
 	of_detach_node(np);
-
 	of_node_put(parent);
 	of_node_put(np); /* Must decrement the refcount */
 	return 0;
  
@@ -381,10 +356,9 @@
 static int do_update_property(char *buf, size_t bufsize)
 {
 	struct device_node *np;
-	struct pSeries_reconfig_prop_update upd_value;
 	unsigned char *value;
 	char *name, *end, *next_prop;
-	int rc, length;
+	int length;
 	struct property *newprop;
 	buf = parse_node(buf, bufsize, &np);
 	end = buf + bufsize;
@@ -406,41 +380,7 @@
 	if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size"))
 		slb_set_size(*(int *)value);
  
-	upd_value.node = np;
-	upd_value.property = newprop;
-	pSeries_reconfig_notify(PSERIES_UPDATE_PROPERTY, &upd_value);
-
-	rc = prom_update_property(np, newprop);
-	if (rc)
-		return rc;
-
-	/* For memory under the ibm,dynamic-reconfiguration-memory node
-	 * of the device tree, adding and removing memory is just an update
-	 * to the ibm,dynamic-memory property instead of adding/removing a
-	 * memory node in the device tree.  For these cases we still need to
-	 * involve the notifier chain.
-	 */
-	if (!strcmp(name, "ibm,dynamic-memory")) {
-		int action;
-
-		next_prop = parse_next_property(next_prop, end, &name,
-						&length, &value);
-		if (!next_prop)
-			return -EINVAL;
-
-		if (!strcmp(name, "add"))
-			action = PSERIES_DRCONF_MEM_ADD;
-		else
-			action = PSERIES_DRCONF_MEM_REMOVE;
-
-		rc = pSeries_reconfig_notify(action, value);
-		if (rc) {
-			prom_update_property(np, newprop);
-			return rc;
-		}
-	}
-
-	return 0;
+	return prom_update_property(np, newprop);
 }
  
 /**
@@ -40,6 +40,7 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/cpuidle.h>
+#include <linux/of.h>
  
 #include <asm/mmu.h>
 #include <asm/processor.h>
@@ -63,7 +64,6 @@
 #include <asm/smp.h>
 #include <asm/firmware.h>
 #include <asm/eeh.h>
-#include <asm/pSeries_reconfig.h>
  
 #include "plpar_wrappers.h"
 #include "pseries.h"
@@ -258,7 +258,7 @@
 	int err = NOTIFY_OK;
  
 	switch (action) {
-	case PSERIES_RECONFIG_ADD:
+	case OF_RECONFIG_ATTACH_NODE:
 		pci = np->parent->data;
 		if (pci) {
 			update_dn_pci_info(np, pci->phb);
@@ -389,7 +389,7 @@
 	/* Find and initialize PCI host bridges */
 	init_pci_config_tokens();
 	find_and_init_phbs();
-	pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
+	of_reconfig_notifier_register(&pci_dn_reconfig_nb);
  
 	pSeries_nvram_init();
  
@@ -28,7 +28,6 @@
 #include <linux/slab.h>
  
 #include <asm/page.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/vio.h>
  
 #include "nx_csbcpb.h" /* struct nx_csbcpb */
  
  
  
  
@@ -1014,26 +1013,23 @@
  *	NOTIFY_BAD encoded with error number on failure, use
  *		notifier_to_errno() to decode this value
  */
-static int nx842_OF_notifier(struct notifier_block *np,
-					unsigned long action,
-					void *update)
+static int nx842_OF_notifier(struct notifier_block *np, unsigned long action,
+			     void *update)
 {
-	struct pSeries_reconfig_prop_update *upd;
+	struct of_prop_reconfig *upd = update;
 	struct nx842_devdata *local_devdata;
 	struct device_node *node = NULL;
  
-	upd = (struct pSeries_reconfig_prop_update *)update;
-
 	rcu_read_lock();
 	local_devdata = rcu_dereference(devdata);
 	if (local_devdata)
 		node = local_devdata->dev->of_node;
  
 	if (local_devdata &&
-			action == PSERIES_UPDATE_PROPERTY &&
-			!strcmp(upd->node->name, node->name)) {
+			action == OF_RECONFIG_UPDATE_PROPERTY &&
+			!strcmp(upd->dn->name, node->name)) {
 		rcu_read_unlock();
-		nx842_OF_upd(upd->property);
+		nx842_OF_upd(upd->prop);
 	} else
 		rcu_read_unlock();
  
@@ -1182,7 +1178,7 @@
 	synchronize_rcu();
 	kfree(old_devdata);
  
-	pSeries_reconfig_notifier_register(&nx842_of_nb);
+	of_reconfig_notifier_register(&nx842_of_nb);
  
 	ret = nx842_OF_upd(NULL);
 	if (ret && ret != -ENODEV) {
@@ -1228,7 +1224,7 @@
 	spin_lock_irqsave(&devdata_mutex, flags);
 	old_devdata = rcu_dereference_check(devdata,
 			lockdep_is_held(&devdata_mutex));
-	pSeries_reconfig_notifier_unregister(&nx842_of_nb);
+	of_reconfig_notifier_unregister(&nx842_of_nb);
 	rcu_assign_pointer(devdata, NULL);
 	spin_unlock_irqrestore(&devdata_mutex, flags);
 	synchronize_rcu();
@@ -33,7 +33,6 @@
 #include <linux/scatterlist.h>
 #include <linux/device.h>
 #include <linux/of.h>
-#include <asm/pSeries_reconfig.h>
 #include <asm/hvcall.h>
 #include <asm/vio.h>
  
@@ -1028,6 +1028,24 @@
 }
 EXPORT_SYMBOL(of_parse_phandle_with_args);
  
+#if defined(CONFIG_OF_DYNAMIC)
+static int of_property_notify(int action, struct device_node *np,
+			      struct property *prop)
+{
+	struct of_prop_reconfig pr;
+
+	pr.dn = np;
+	pr.prop = prop;
+	return of_reconfig_notify(action, &pr);
+}
+#else
+static int of_property_notify(int action, struct device_node *np,
+			      struct property *prop)
+{
+	return 0;
+}
+#endif
+
 /**
  * prom_add_property - Add a property to a node
  */
  
@@ -1035,7 +1053,12 @@
 {
 	struct property **next;
 	unsigned long flags;
+	int rc;
  
+	rc = of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop);
+	if (rc)
+		return rc;
+
 	prop->next = NULL;
 	write_lock_irqsave(&devtree_lock, flags);
 	next = &np->properties;
  
@@ -1072,7 +1095,12 @@
 	struct property **next;
 	unsigned long flags;
 	int found = 0;
+	int rc;
  
+	rc = of_property_notify(OF_RECONFIG_REMOVE_PROPERTY, np, prop);
+	if (rc)
+		return rc;
+
 	write_lock_irqsave(&devtree_lock, flags);
 	next = &np->properties;
 	while (*next) {
  
@@ -1114,8 +1142,12 @@
 {
 	struct property **next, *oldprop;
 	unsigned long flags;
-	int found = 0;
+	int rc, found = 0;
  
+	rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop);
+	if (rc)
+		return rc;
+
 	if (!newprop->name)
 		return -EINVAL;
  
@@ -1160,6 +1192,26 @@
  * device tree nodes.
  */
  
+static BLOCKING_NOTIFIER_HEAD(of_reconfig_chain);
+
+int of_reconfig_notifier_register(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_register(&of_reconfig_chain, nb);
+}
+
+int of_reconfig_notifier_unregister(struct notifier_block *nb)
+{
+	return blocking_notifier_chain_unregister(&of_reconfig_chain, nb);
+}
+
+int of_reconfig_notify(unsigned long action, void *p)
+{
+	int rc;
+
+	rc = blocking_notifier_call_chain(&of_reconfig_chain, action, p);
+	return notifier_to_errno(rc);
+}
+
 #ifdef CONFIG_PROC_DEVICETREE
 static void of_add_proc_dt_entry(struct device_node *dn)
 {
  
  
@@ -1179,10 +1231,15 @@
 /**
  * of_attach_node - Plug a device node into the tree and global list.
  */
-void of_attach_node(struct device_node *np)
+int of_attach_node(struct device_node *np)
 {
 	unsigned long flags;
+	int rc;
  
+	rc = of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, np);
+	if (rc)
+		return rc;
+
 	write_lock_irqsave(&devtree_lock, flags);
 	np->sibling = np->parent->child;
 	np->allnext = allnodes;
@@ -1191,6 +1248,7 @@
 	write_unlock_irqrestore(&devtree_lock, flags);
  
 	of_add_proc_dt_entry(np);
+	return 0;
 }
  
 #ifdef CONFIG_PROC_DEVICETREE
  
  
  
  
@@ -1220,23 +1278,28 @@
  * The caller must hold a reference to the node.  The memory associated with
  * the node is not freed until its refcount goes to zero.
  */
-void of_detach_node(struct device_node *np)
+int of_detach_node(struct device_node *np)
 {
 	struct device_node *parent;
 	unsigned long flags;
+	int rc = 0;
  
+	rc = of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
+	if (rc)
+		return rc;
+
 	write_lock_irqsave(&devtree_lock, flags);
  
 	if (of_node_check_flag(np, OF_DETACHED)) {
 		/* someone already detached it */
 		write_unlock_irqrestore(&devtree_lock, flags);
-		return;
+		return rc;
 	}
  
 	parent = np->parent;
 	if (!parent) {
 		write_unlock_irqrestore(&devtree_lock, flags);
-		return;
+		return rc;
 	}
  
 	if (allnodes == np)
@@ -1265,6 +1328,7 @@
 	write_unlock_irqrestore(&devtree_lock, flags);
  
 	of_remove_proc_dt_entry(np);
+	return rc;
 }
 #endif /* defined(CONFIG_OF_DYNAMIC) */
  
@@ -22,6 +22,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/spinlock.h>
 #include <linux/topology.h>
+#include <linux/notifier.h>
  
 #include <asm/byteorder.h>
 #include <asm/errno.h>
  
@@ -272,11 +273,24 @@
 extern int prom_update_property(struct device_node *np,
 				struct property *newprop);
  
-#if defined(CONFIG_OF_DYNAMIC)
 /* For updating the device tree at runtime */
-extern void of_attach_node(struct device_node *);
-extern void of_detach_node(struct device_node *);
-#endif
+#define OF_RECONFIG_ATTACH_NODE		0x0001
+#define OF_RECONFIG_DETACH_NODE		0x0002
+#define OF_RECONFIG_ADD_PROPERTY	0x0003
+#define OF_RECONFIG_REMOVE_PROPERTY	0x0004
+#define OF_RECONFIG_UPDATE_PROPERTY	0x0005
+
+struct of_prop_reconfig {
+	struct device_node	*dn;
+	struct property		*prop;
+};
+
+extern int of_reconfig_notifier_register(struct notifier_block *);
+extern int of_reconfig_notifier_unregister(struct notifier_block *);
+extern int of_reconfig_notify(unsigned long, void *);
+
+extern int of_attach_node(struct device_node *);
+extern int of_detach_node(struct device_node *);
  
 #define of_match_ptr(_ptr)	(_ptr)
...	...	@@ -2,43 +2,11 @@
2	2	#define _PPC64_PSERIES_RECONFIG_H
3	3	#ifdef __KERNEL__
4	4
5		-#include <linux/notifier.h>
6		-
7		-/*
8		- * Use this API if your code needs to know about OF device nodes being
9		- * added or removed on pSeries systems.
10		- */
11		-
12		-#define PSERIES_RECONFIG_ADD 0x0001
13		-#define PSERIES_RECONFIG_REMOVE 0x0002
14		-#define PSERIES_DRCONF_MEM_ADD 0x0003
15		-#define PSERIES_DRCONF_MEM_REMOVE 0x0004
16		-#define PSERIES_UPDATE_PROPERTY 0x0005
17		-
18		-/**
19		- * pSeries_reconfig_notify - Notifier value structure for OFDT property updates
20		- *
21		- * @node: Device tree node which owns the property being updated
22		- * @property: Updated property
23		- */
24		-struct pSeries_reconfig_prop_update {
25		- struct device_node *node;
26		- struct property *property;
27		-};
28		-
29	5	#ifdef CONFIG_PPC_PSERIES
30		-extern int pSeries_reconfig_notifier_register(struct notifier_block *);
31		-extern void pSeries_reconfig_notifier_unregister(struct notifier_block *);
32		-extern int pSeries_reconfig_notify(unsigned long action, void *p);
33	6	/* Not the best place to put this, will be fixed when we move some
34	7	* of the rtas suspend-me stuff to pseries */
35	8	extern void pSeries_coalesce_init(void);
36	9	#else /* !CONFIG_PPC_PSERIES */
37		-static inline int pSeries_reconfig_notifier_register(struct notifier_block *nb)
38		-{
39		- return 0;
40		-}
41		-static inline void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) { }
42	10	static inline void pSeries_coalesce_init(void) { }
43	11	#endif /* CONFIG_PPC_PSERIES */
44	12
...	...	@@ -32,6 +32,7 @@
32	32	#include <linux/debugfs.h>
33	33	#include <linux/irq.h>
34	34	#include <linux/memblock.h>
	35	+#include <linux/of.h>
35	36
36	37	#include <asm/prom.h>
37	38	#include <asm/rtas.h>
...	...	@@ -49,7 +50,6 @@
49	50	#include <asm/btext.h>
50	51	#include <asm/sections.h>
51	52	#include <asm/machdep.h>
52		-#include <asm/pSeries_reconfig.h>
53	53	#include <asm/pci-bridge.h>
54	54	#include <asm/kexec.h>
55	55	#include <asm/opal.h>
...	...	@@ -802,7 +802,7 @@
802	802	int err;
803	803
804	804	switch (action) {
805		- case PSERIES_RECONFIG_ADD:
	805	+ case OF_RECONFIG_ATTACH_NODE:
806	806	err = of_finish_dynamic_node(node);
807	807	if (err < 0)
808	808	printk(KERN_ERR "finish_node returned %d\n", err);
...	...	@@ -821,7 +821,7 @@
821	821
822	822	static int __init prom_reconfig_setup(void)
823	823	{
824		- return pSeries_reconfig_notifier_register(&prom_reconfig_nb);
	824	+ return of_reconfig_notifier_register(&prom_reconfig_nb);
825	825	}
826	826	__initcall(prom_reconfig_setup);
827	827	#endif
...	...	@@ -16,13 +16,13 @@
16	16	#include <linux/spinlock.h>
17	17	#include <linux/cpu.h>
18	18	#include <linux/slab.h>
	19	+#include <linux/of.h>
19	20	#include "offline_states.h"
20	21
21	22	#include <asm/prom.h>
22	23	#include <asm/machdep.h>
23	24	#include <asm/uaccess.h>
24	25	#include <asm/rtas.h>
25		-#include <asm/pSeries_reconfig.h>
26	26
27	27	struct cc_workarea {
28	28	u32 drc_index;
29	29
30	30
31	31
...	...	@@ -262,24 +262,26 @@
262	262	if (!dn->parent)
263	263	return -ENOMEM;
264	264
265		- rc = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, dn);
	265	+ rc = of_attach_node(dn);
266	266	if (rc) {
267	267	printk(KERN_ERR "Failed to add device node %s\n",
268	268	dn->full_name);
269	269	return rc;
270	270	}
271	271
272		- of_attach_node(dn);
273	272	of_node_put(dn->parent);
274	273	return 0;
275	274	}
276	275
277	276	int dlpar_detach_node(struct device_node *dn)
278	277	{
279		- pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, dn);
280		- of_detach_node(dn);
281		- of_node_put(dn); /* Must decrement the refcount */
	278	+ int rc;
282	279
	280	+ rc = of_detach_node(dn);
	281	+ if (rc)
	282	+ return rc;
	283	+
	284	+ of_node_put(dn); /* Must decrement the refcount */
283	285	return 0;
284	286	}
285	287
...	...	@@ -23,12 +23,12 @@
23	23	#include <linux/delay.h>
24	24	#include <linux/sched.h> /* for idle_task_exit */
25	25	#include <linux/cpu.h>
	26	+#include <linux/of.h>
26	27	#include <asm/prom.h>
27	28	#include <asm/rtas.h>
28	29	#include <asm/firmware.h>
29	30	#include <asm/machdep.h>
30	31	#include <asm/vdso_datapage.h>
31		-#include <asm/pSeries_reconfig.h>
32	32	#include <asm/xics.h>
33	33	#include "plpar_wrappers.h"
34	34	#include "offline_states.h"
35	35
...	...	@@ -333,10 +333,10 @@
333	333	int err = 0;
334	334
335	335	switch (action) {
336		- case PSERIES_RECONFIG_ADD:
	336	+ case OF_RECONFIG_ATTACH_NODE:
337	337	err = pseries_add_processor(node);
338	338	break;
339		- case PSERIES_RECONFIG_REMOVE:
	339	+ case OF_RECONFIG_DETACH_NODE:
340	340	pseries_remove_processor(node);
341	341	break;
342	342	}
...	...	@@ -399,7 +399,7 @@
399	399
400	400	/* Processors can be added/removed only on LPAR */
401	401	if (firmware_has_feature(FW_FEATURE_LPAR)) {
402		- pSeries_reconfig_notifier_register(&pseries_smp_nb);
	402	+ of_reconfig_notifier_register(&pseries_smp_nb);
403	403	cpu_maps_update_begin();
404	404	if (cede_offline_enabled && parse_cede_parameters() == 0) {
405	405	default_offline_state = CPU_STATE_INACTIVE;
...	...	@@ -16,7 +16,6 @@
16	16
17	17	#include <asm/firmware.h>
18	18	#include <asm/machdep.h>
19		-#include <asm/pSeries_reconfig.h>
20	19	#include <asm/sparsemem.h>
21	20
22	21	static unsigned long get_memblock_size(void)
23	22
24	23
25	24
26	25
27	26
28	27
29	28
30	29
...	...	@@ -187,42 +186,69 @@
187	186	return (ret < 0) ? -EINVAL : 0;
188	187	}
189	188
190		-static int pseries_drconf_memory(unsigned long *base, unsigned int action)
	189	+static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
191	190	{
	191	+ struct of_drconf_cell new_drmem, old_drmem;
192	192	unsigned long memblock_size;
193		- int rc;
	193	+ u32 entries;
	194	+ u32 *p;
	195	+ int i, rc = -EINVAL;
194	196
195	197	memblock_size = get_memblock_size();
196	198	if (!memblock_size)
197	199	return -EINVAL;
198	200
199		- if (action == PSERIES_DRCONF_MEM_ADD) {
200		- rc = memblock_add(*base, memblock_size);
201		- rc = (rc < 0) ? -EINVAL : 0;
202		- } else if (action == PSERIES_DRCONF_MEM_REMOVE) {
203		- rc = pseries_remove_memblock(*base, memblock_size);
204		- } else {
205		- rc = -EINVAL;
	201	+ p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
	202	+ if (!p)
	203	+ return -EINVAL;
	204	+
	205	+ /* The first int of the property is the number of lmb's described
	206	+ * by the property. This is followed by an array of of_drconf_cell
	207	+ * entries. Get the niumber of entries and skip to the array of
	208	+ * of_drconf_cell's.
	209	+ */
	210	+ entries = *p++;
	211	+ old_drmem = (struct of_drconf_cell *)p;
	212	+
	213	+ p = (u32 *)pr->prop->value;
	214	+ p++;
	215	+ new_drmem = (struct of_drconf_cell *)p;
	216	+
	217	+ for (i = 0; i < entries; i++) {
	218	+ if ((old_drmem[i].flags & DRCONF_MEM_ASSIGNED) &&
	219	+ (!(new_drmem[i].flags & DRCONF_MEM_ASSIGNED))) {
	220	+ rc = pseries_remove_memblock(old_drmem[i].base_addr,
	221	+ memblock_size);
	222	+ break;
	223	+ } else if ((!(old_drmem[i].flags & DRCONF_MEM_ASSIGNED)) &&
	224	+ (new_drmem[i].flags & DRCONF_MEM_ASSIGNED)) {
	225	+ rc = memblock_add(old_drmem[i].base_addr,
	226	+ memblock_size);
	227	+ rc = (rc < 0) ? -EINVAL : 0;
	228	+ break;
	229	+ }
206	230	}
207	231
208	232	return rc;
209	233	}
210	234
211	235	static int pseries_memory_notifier(struct notifier_block *nb,
212		- unsigned long action, void *node)
	236	+ unsigned long action, void *node)
213	237	{
	238	+ struct of_prop_reconfig *pr;
214	239	int err = 0;
215	240
216	241	switch (action) {
217		- case PSERIES_RECONFIG_ADD:
	242	+ case OF_RECONFIG_ATTACH_NODE:
218	243	err = pseries_add_memory(node);
219	244	break;
220		- case PSERIES_RECONFIG_REMOVE:
	245	+ case OF_RECONFIG_DETACH_NODE:
221	246	err = pseries_remove_memory(node);
222	247	break;
223		- case PSERIES_DRCONF_MEM_ADD:
224		- case PSERIES_DRCONF_MEM_REMOVE:
225		- err = pseries_drconf_memory(node, action);
	248	+ case OF_RECONFIG_UPDATE_PROPERTY:
	249	+ pr = (struct of_prop_reconfig *)node;
	250	+ if (!strcmp(pr->prop->name, "ibm,dynamic-memory"))
	251	+ err = pseries_update_drconf_memory(pr);
226	252	break;
227	253	}
228	254	return notifier_from_errno(err);
...	...	@@ -235,7 +261,7 @@
235	261	static int __init pseries_memory_hotplug_init(void)
236	262	{
237	263	if (firmware_has_feature(FW_FEATURE_LPAR))
238		- pSeries_reconfig_notifier_register(&pseries_mem_nb);
	264	+ of_reconfig_notifier_register(&pseries_mem_nb);
239	265
240	266	return 0;
241	267	}
...	...	@@ -36,13 +36,13 @@
36	36	#include <linux/dma-mapping.h>
37	37	#include <linux/crash_dump.h>
38	38	#include <linux/memory.h>
	39	+#include <linux/of.h>
39	40	#include <asm/io.h>
40	41	#include <asm/prom.h>
41	42	#include <asm/rtas.h>
42	43	#include <asm/iommu.h>
43	44	#include <asm/pci-bridge.h>
44	45	#include <asm/machdep.h>
45		-#include <asm/pSeries_reconfig.h>
46	46	#include <asm/firmware.h>
47	47	#include <asm/tce.h>
48	48	#include <asm/ppc-pci.h>
...	...	@@ -1294,7 +1294,7 @@
1294	1294	struct direct_window *window;
1295	1295
1296	1296	switch (action) {
1297		- case PSERIES_RECONFIG_REMOVE:
	1297	+ case OF_RECONFIG_DETACH_NODE:
1298	1298	if (pci && pci->iommu_table)
1299	1299	iommu_free_table(pci->iommu_table, np->full_name);
1300	1300
...	...	@@ -1357,7 +1357,7 @@
1357	1357	}
1358	1358
1359	1359
1360		- pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
	1360	+ of_reconfig_notifier_register(&iommu_reconfig_nb);
1361	1361	register_memory_notifier(&iommu_mem_nb);
1362	1362
1363	1363	set_pci_dma_ops(&dma_iommu_ops);
...	...	@@ -16,11 +16,11 @@
16	16	#include <linux/notifier.h>
17	17	#include <linux/proc_fs.h>
18	18	#include <linux/slab.h>
	19	+#include <linux/of.h>
19	20
20	21	#include <asm/prom.h>
21	22	#include <asm/machdep.h>
22	23	#include <asm/uaccess.h>
23		-#include <asm/pSeries_reconfig.h>
24	24	#include <asm/mmu.h>
25	25
26	26	/**
...	...	@@ -55,28 +55,6 @@
55	55	return parent;
56	56	}
57	57
58		-static BLOCKING_NOTIFIER_HEAD(pSeries_reconfig_chain);
59		-
60		-int pSeries_reconfig_notifier_register(struct notifier_block *nb)
61		-{
62		- return blocking_notifier_chain_register(&pSeries_reconfig_chain, nb);
63		-}
64		-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_register);
65		-
66		-void pSeries_reconfig_notifier_unregister(struct notifier_block *nb)
67		-{
68		- blocking_notifier_chain_unregister(&pSeries_reconfig_chain, nb);
69		-}
70		-EXPORT_SYMBOL_GPL(pSeries_reconfig_notifier_unregister);
71		-
72		-int pSeries_reconfig_notify(unsigned long action, void *p)
73		-{
74		- int err = blocking_notifier_call_chain(&pSeries_reconfig_chain,
75		- action, p);
76		-
77		- return notifier_to_errno(err);
78		-}
79		-
80	58	static int pSeries_reconfig_add_node(const char path, struct property proplist)
81	59	{
82	60	struct device_node *np;
83	61
...	...	@@ -100,13 +78,12 @@
100	78	goto out_err;
101	79	}
102	80
103		- err = pSeries_reconfig_notify(PSERIES_RECONFIG_ADD, np);
	81	+ err = of_attach_node(np);
104	82	if (err) {
105	83	printk(KERN_ERR "Failed to add device node %s\n", path);
106	84	goto out_err;
107	85	}
108	86
109		- of_attach_node(np);
110	87	of_node_put(np->parent);
111	88
112	89	return 0;
113	90
...	...	@@ -134,9 +111,7 @@
134	111	return -EBUSY;
135	112	}
136	113
137		- pSeries_reconfig_notify(PSERIES_RECONFIG_REMOVE, np);
138	114	of_detach_node(np);
139		-
140	115	of_node_put(parent);
141	116	of_node_put(np); /* Must decrement the refcount */
142	117	return 0;
143	118
...	...	@@ -381,10 +356,9 @@
381	356	static int do_update_property(char *buf, size_t bufsize)
382	357	{
383	358	struct device_node *np;
384		- struct pSeries_reconfig_prop_update upd_value;
385	359	unsigned char *value;
386	360	char name, end, *next_prop;
387		- int rc, length;
	361	+ int length;
388	362	struct property *newprop;
389	363	buf = parse_node(buf, bufsize, &np);
390	364	end = buf + bufsize;
...	...	@@ -406,41 +380,7 @@
406	380	if (!strcmp(name, "slb-size") \|\| !strcmp(name, "ibm,slb-size"))
407	381	slb_set_size((int )value);
408	382
409		- upd_value.node = np;
410		- upd_value.property = newprop;
411		- pSeries_reconfig_notify(PSERIES_UPDATE_PROPERTY, &upd_value);
412		-
413		- rc = prom_update_property(np, newprop);
414		- if (rc)
415		- return rc;
416		-
417		- /* For memory under the ibm,dynamic-reconfiguration-memory node
418		- * of the device tree, adding and removing memory is just an update
419		- * to the ibm,dynamic-memory property instead of adding/removing a
420		- * memory node in the device tree. For these cases we still need to
421		- * involve the notifier chain.
422		- */
423		- if (!strcmp(name, "ibm,dynamic-memory")) {
424		- int action;
425		-
426		- next_prop = parse_next_property(next_prop, end, &name,
427		- &length, &value);
428		- if (!next_prop)
429		- return -EINVAL;
430		-
431		- if (!strcmp(name, "add"))
432		- action = PSERIES_DRCONF_MEM_ADD;
433		- else
434		- action = PSERIES_DRCONF_MEM_REMOVE;
435		-
436		- rc = pSeries_reconfig_notify(action, value);
437		- if (rc) {
438		- prom_update_property(np, newprop);
439		- return rc;
440		- }
441		- }
442		-
443		- return 0;
	383	+ return prom_update_property(np, newprop);
444	384	}
445	385
446	386	/**
...	...	@@ -40,6 +40,7 @@
40	40	#include <linux/seq_file.h>
41	41	#include <linux/root_dev.h>
42	42	#include <linux/cpuidle.h>
	43	+#include <linux/of.h>
43	44
44	45	#include <asm/mmu.h>
45	46	#include <asm/processor.h>
...	...	@@ -63,7 +64,6 @@
63	64	#include <asm/smp.h>
64	65	#include <asm/firmware.h>
65	66	#include <asm/eeh.h>
66		-#include <asm/pSeries_reconfig.h>
67	67
68	68	#include "plpar_wrappers.h"
69	69	#include "pseries.h"
...	...	@@ -258,7 +258,7 @@
258	258	int err = NOTIFY_OK;
259	259
260	260	switch (action) {
261		- case PSERIES_RECONFIG_ADD:
	261	+ case OF_RECONFIG_ATTACH_NODE:
262	262	pci = np->parent->data;
263	263	if (pci) {
264	264	update_dn_pci_info(np, pci->phb);
...	...	@@ -389,7 +389,7 @@
389	389	/* Find and initialize PCI host bridges */
390	390	init_pci_config_tokens();
391	391	find_and_init_phbs();
392		- pSeries_reconfig_notifier_register(&pci_dn_reconfig_nb);
	392	+ of_reconfig_notifier_register(&pci_dn_reconfig_nb);
393	393
394	394	pSeries_nvram_init();
395	395
...	...	@@ -28,7 +28,6 @@
28	28	#include <linux/slab.h>
29	29
30	30	#include <asm/page.h>
31		-#include <asm/pSeries_reconfig.h>
32	31	#include <asm/vio.h>
33	32
34	33	#include "nx_csbcpb.h" /* struct nx_csbcpb */
35	34
36	35
37	36
38	37
...	...	@@ -1014,26 +1013,23 @@
1014	1013	* NOTIFY_BAD encoded with error number on failure, use
1015	1014	* notifier_to_errno() to decode this value
1016	1015	*/
1017		-static int nx842_OF_notifier(struct notifier_block *np,
1018		- unsigned long action,
1019		- void *update)
	1016	+static int nx842_OF_notifier(struct notifier_block *np, unsigned long action,
	1017	+ void *update)
1020	1018	{
1021		- struct pSeries_reconfig_prop_update *upd;
	1019	+ struct of_prop_reconfig *upd = update;
1022	1020	struct nx842_devdata *local_devdata;
1023	1021	struct device_node *node = NULL;
1024	1022
1025		- upd = (struct pSeries_reconfig_prop_update *)update;
1026		-
1027	1023	rcu_read_lock();
1028	1024	local_devdata = rcu_dereference(devdata);
1029	1025	if (local_devdata)
1030	1026	node = local_devdata->dev->of_node;
1031	1027
1032	1028	if (local_devdata &&
1033		- action == PSERIES_UPDATE_PROPERTY &&
1034		- !strcmp(upd->node->name, node->name)) {
	1029	+ action == OF_RECONFIG_UPDATE_PROPERTY &&
	1030	+ !strcmp(upd->dn->name, node->name)) {
1035	1031	rcu_read_unlock();
1036		- nx842_OF_upd(upd->property);
	1032	+ nx842_OF_upd(upd->prop);
1037	1033	} else
1038	1034	rcu_read_unlock();
1039	1035
...	...	@@ -1182,7 +1178,7 @@
1182	1178	synchronize_rcu();
1183	1179	kfree(old_devdata);
1184	1180
1185		- pSeries_reconfig_notifier_register(&nx842_of_nb);
	1181	+ of_reconfig_notifier_register(&nx842_of_nb);
1186	1182
1187	1183	ret = nx842_OF_upd(NULL);
1188	1184	if (ret && ret != -ENODEV) {
...	...	@@ -1228,7 +1224,7 @@
1228	1224	spin_lock_irqsave(&devdata_mutex, flags);
1229	1225	old_devdata = rcu_dereference_check(devdata,
1230	1226	lockdep_is_held(&devdata_mutex));
1231		- pSeries_reconfig_notifier_unregister(&nx842_of_nb);
	1227	+ of_reconfig_notifier_unregister(&nx842_of_nb);
1232	1228	rcu_assign_pointer(devdata, NULL);
1233	1229	spin_unlock_irqrestore(&devdata_mutex, flags);
1234	1230	synchronize_rcu();
...	...	@@ -33,7 +33,6 @@
33	33	#include <linux/scatterlist.h>
34	34	#include <linux/device.h>
35	35	#include <linux/of.h>
36		-#include <asm/pSeries_reconfig.h>
37	36	#include <asm/hvcall.h>
38	37	#include <asm/vio.h>
39	38