of/reconfig: Always use the same structure for notifiers

The OF_RECONFIG notifier callback uses a different structure depending
on whether it is a node change or a property change. This is silly, and
not very safe. Rework the code to use the same data structure regardless
of the type of notifier.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: <linuxppc-dev@lists.ozlabs.org>
(cherry picked from commit f5242e5a883bf1c1aba6bfd87b85e7dda0e62191)
Signed-off-by: Mark Brown <broonie@kernel.org>
Conflicts:
	arch/powerpc/platforms/pseries/hotplug-memory.c
	include/linux/of.h

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 88c0425dc0a88f41f61c38b4d01888ec468a937c..92c456ce1f875b3ffdad2fbfb56457d7a0e63cfb 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1539,12 +1539,11 @@ static void stage_topology_update(int core_id)
 static int dt_update_callback(struct notifier_block *nb,
                                unsigned long action, void *data)
 {
-       struct of_prop_reconfig *update;
+       struct of_reconfig_data *update = data;
        int rc = NOTIFY_DONE;
 
        switch (action) {
        case OF_RECONFIG_UPDATE_PROPERTY:
-               update = (struct of_prop_reconfig *)data;
                if (!of_prop_cmp(update->dn->type, "cpu") &&
                    !of_prop_cmp(update->prop->name, "ibm,associativity")) {
                        u32 core_id;

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 217ca5c75b2007f32615266fb20f36fce359a2cd..6d4f30ac883a355dfedf61ba935200eefce30a4e 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -336,16 +336,17 @@ static void pseries_remove_processor(struct device_node *np)
 }
 
 static int pseries_smp_notifier(struct notifier_block *nb,
-                               unsigned long action, void *node)
+                               unsigned long action, void *data)
 {
+       struct of_reconfig_data *rd = data;
        int err = 0;
 
        switch (action) {
        case OF_RECONFIG_ATTACH_NODE:
-               err = pseries_add_processor(node);
+               err = pseries_add_processor(rd->dn);
                break;
        case OF_RECONFIG_DETACH_NODE:
-               pseries_remove_processor(node);
+               pseries_remove_processor(rd->dn);
                break;
        }
        return notifier_from_errno(err);

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 06d6e5bdde70fd1af6949d1327d234a66962c7cd..0282933be40c1241f16589a6d588c52008f8b01b 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -198,7 +198,7 @@ static int pseries_add_memory(struct device_node *np)
        return (ret < 0) ? -EINVAL : 0;
 }
 
-static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
+static int pseries_update_drconf_memory(struct of_reconfig_data *pr)
 {
        struct of_drconf_cell *new_drmem, *old_drmem;
        unsigned long memblock_size;
@@ -245,9 +245,9 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
 }
 
 static int pseries_memory_notifier(struct notifier_block *nb,
-                                  unsigned long action, void *node)
+                                  unsigned long action, void *data)
 {
-       struct of_prop_reconfig *pr;
+       struct of_reconfig_data *rd = data;
        int err = 0;
 
        switch (action) {
@@ -258,9 +258,8 @@ static int pseries_memory_notifier(struct notifier_block *nb,
                err = pseries_remove_memory(node);
                break;
        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);
+               if (!strcmp(rd->prop->name, "ibm,dynamic-memory"))
+                       err = pseries_update_drconf_memory(rd);
                break;
        }
        return notifier_from_errno(err);

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 86ae364900d60cbde3000d44481e248e9895609a..ed02eb47ac70c8a3b7ae43119929864a48d54271 100644 (file)
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -1325,10 +1325,11 @@ static struct notifier_block iommu_mem_nb = {
        .notifier_call = iommu_mem_notifier,
 };
 
-static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
+static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *data)
 {
        int err = NOTIFY_OK;
-       struct device_node *np = node;
+       struct of_reconfig_data *rd = data;
+       struct device_node *np = rd->dn;
        struct pci_dn *pci = PCI_DN(np);
        struct direct_window *window;
 

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index c11c8238797c30574c9f77f88c561af049a26ab9..8a78afc870e6c0255a1881e0cddaa1758e478174 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -253,9 +253,10 @@ static void __init pseries_discover_pic(void)
               " interrupt-controller\n");
 }
 
-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 *data)
 {
-       struct device_node *np = node;
+       struct of_reconfig_data *rd = data;
+       struct device_node *np = rd->dn;
        struct pci_dn *pci = NULL;
        int err = NOTIFY_OK;
 

diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index 142533fbce39a50dfb3dc13e7a6f2834cdceb7cc..01783e46f25afbe96c943a37fb8705f7d65ba811 100644 (file)
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -1000,9 +1000,9 @@ error_out:
  *             notifier_to_errno() to decode this value
  */
 static int nx842_OF_notifier(struct notifier_block *np, unsigned long action,
-                            void *update)
+                            void *data)
 {
-       struct of_prop_reconfig *upd = update;
+       struct of_reconfig_data *upd = data;
        struct nx842_devdata *local_devdata;
        struct device_node *node = NULL;
 

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 7e57f58d0862e455fc8068dee143d52aea23e268..bf3e53e243a1aa93fbeb15cbb62067964067d0b6 100644 (file)
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -84,18 +84,17 @@ const char *action_names[] = {
 };
 #endif
 
-int of_reconfig_notify(unsigned long action, void *p)
+int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p)
 {
        int rc;
 #ifdef DEBUG
-       struct device_node *dn = p;
-       struct of_prop_reconfig *pr = p;
+       struct of_reconfig_data *pr = p;
 
        switch (action) {
        case OF_RECONFIG_ATTACH_NODE:
        case OF_RECONFIG_DETACH_NODE:
                pr_debug("of/notify %-15s %s\n", action_names[action],
-                       dn->full_name);
+                       pr->dn->full_name);
                break;
        case OF_RECONFIG_ADD_PROPERTY:
        case OF_RECONFIG_REMOVE_PROPERTY:
@@ -119,31 +118,22 @@ int of_reconfig_notify(unsigned long action, void *p)
  * Returns 0 on device going from enabled to disabled, 1 on device
  * going from disabled to enabled and -1 on no change.
  */
-int of_reconfig_get_state_change(unsigned long action, void *arg)
+int of_reconfig_get_state_change(unsigned long action, struct of_reconfig_data *pr)
 {
-       struct device_node *dn;
-       struct property *prop, *old_prop;
-       struct of_prop_reconfig *pr;
+       struct property *prop, *old_prop = NULL;
        int is_status, status_state, old_status_state, prev_state, new_state;
 
        /* figure out if a device should be created or destroyed */
-       dn = NULL;
-       prop = old_prop = NULL;
        switch (action) {
        case OF_RECONFIG_ATTACH_NODE:
        case OF_RECONFIG_DETACH_NODE:
-               dn = arg;
-               prop = of_find_property(dn, "status", NULL);
+               prop = of_find_property(pr->dn, "status", NULL);
                break;
        case OF_RECONFIG_ADD_PROPERTY:
        case OF_RECONFIG_REMOVE_PROPERTY:
-               pr = arg;
-               dn = pr->dn;
                prop = pr->prop;
                break;
        case OF_RECONFIG_UPDATE_PROPERTY:
-               pr = arg;
-               dn = pr->dn;
                prop = pr->prop;
                old_prop = pr->old_prop;
                break;
@@ -209,7 +199,7 @@ EXPORT_SYMBOL_GPL(of_reconfig_get_state_change);
 int of_property_notify(int action, struct device_node *np,
                       struct property *prop, struct property *oldprop)
 {
-       struct of_prop_reconfig pr;
+       struct of_reconfig_data pr;
 
        /* only call notifiers if the node is attached */
        if (!of_node_is_attached(np))
@@ -249,8 +239,12 @@ void __of_attach_node(struct device_node *np)
  */
 int of_attach_node(struct device_node *np)
 {
+       struct of_reconfig_data rd;
        unsigned long flags;
 
+       memset(&rd, 0, sizeof(rd));
+       rd.dn = np;
+
        mutex_lock(&of_mutex);
        raw_spin_lock_irqsave(&devtree_lock, flags);
        __of_attach_node(np);
@@ -259,7 +253,7 @@ int of_attach_node(struct device_node *np)
        __of_attach_node_sysfs(np);
        mutex_unlock(&of_mutex);
 
-       of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, np);
+       of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, &rd);
 
        return 0;
 }
@@ -308,9 +302,13 @@ void __of_detach_node(struct device_node *np)
  */
 int of_detach_node(struct device_node *np)
 {
+       struct of_reconfig_data rd;
        unsigned long flags;
        int rc = 0;
 
+       memset(&rd, 0, sizeof(rd));
+       rd.dn = np;
+
        mutex_lock(&of_mutex);
        raw_spin_lock_irqsave(&devtree_lock, flags);
        __of_detach_node(np);
@@ -319,7 +317,7 @@ int of_detach_node(struct device_node *np)
        __of_detach_node_sysfs(np);
        mutex_unlock(&of_mutex);
 
-       of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
+       of_reconfig_notify(OF_RECONFIG_DETACH_NODE, &rd);
 
        return rc;
 }
@@ -497,6 +495,7 @@ static void __of_changeset_entry_invert(struct of_changeset_entry *ce,
 
 static void __of_changeset_entry_notify(struct of_changeset_entry *ce, bool revert)
 {
+       struct of_reconfig_data rd;
        struct of_changeset_entry ce_inverted;
        int ret;
 
@@ -508,7 +507,9 @@ static void __of_changeset_entry_notify(struct of_changeset_entry *ce, bool reve
        switch (ce->action) {
        case OF_RECONFIG_ATTACH_NODE:
        case OF_RECONFIG_DETACH_NODE:
-               ret = of_reconfig_notify(ce->action, ce->np);
+               memset(&rd, 0, sizeof(rd));
+               rd.dn = ce->np;
+               ret = of_reconfig_notify(ce->action, &rd);
                break;
        case OF_RECONFIG_ADD_PROPERTY:
        case OF_RECONFIG_REMOVE_PROPERTY:

diff --git a/include/linux/of.h b/include/linux/of.h
index fd4b6916324a45f8c77775ad31489fbe02864318..1596e3352326a6b759e3d49788f6402bfff230e2 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -74,6 +74,12 @@ struct of_phandle_args {
        uint32_t args[MAX_PHANDLE_ARGS];
 };
 
+struct of_reconfig_data {
+       struct device_node      *dn;
+       struct property         *prop;
+       struct property         *old_prop;
+};
+
 /* initialize a node */
 extern struct kobj_type of_node_ktype;
 static inline void of_node_init(struct device_node *node)
@@ -345,17 +351,6 @@ extern int of_update_property(struct device_node *np, struct property *newprop);
 #define OF_RECONFIG_REMOVE_PROPERTY    0x0004
 #define OF_RECONFIG_UPDATE_PROPERTY    0x0005
 
-struct of_prop_reconfig {
-       struct device_node      *dn;
-       struct property         *prop;
-       struct property         *old_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_reconfig_get_state_change(unsigned long action, void *arg);
-
 extern int of_attach_node(struct device_node *);
 extern int of_detach_node(struct device_node *);
 
@@ -738,6 +733,12 @@ enum of_reconfig_change {
 };
 
 #ifdef CONFIG_OF_DYNAMIC
+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, struct of_reconfig_data *rd);
+extern int of_reconfig_get_state_change(unsigned long action,
+                                       struct of_reconfig_data *arg);
+
 extern void of_changeset_init(struct of_changeset *ocs);
 extern void of_changeset_destroy(struct of_changeset *ocs);
 extern int of_changeset_apply(struct of_changeset *ocs);
@@ -775,7 +776,26 @@ static inline int of_changeset_update_property(struct of_changeset *ocs,
 {
        return of_changeset_action(ocs, OF_RECONFIG_UPDATE_PROPERTY, np, prop);
 }
-#endif
+#else /* CONFIG_OF_DYNAMIC */
+static inline int of_reconfig_notifier_register(struct notifier_block *nb)
+{
+       return -EINVAL;
+}
+static inline int of_reconfig_notifier_unregister(struct notifier_block *nb)
+{
+       return -EINVAL;
+}
+static inline int of_reconfig_notify(unsigned long action,
+                                    struct of_reconfig_data *arg)
+{
+       return -EINVAL;
+}
+static inline int of_reconfig_get_state_change(unsigned long action,
+                                               struct of_reconfig_data *arg)
+{
+       return -EINVAL;
+}
+#endif /* CONFIG_OF_DYNAMIC */
 
 /* CONFIG_OF_RESOLVE api */
 extern int of_resolve_phandles(struct device_node *tree);