Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5242e5a authored by Grant Likely's avatar Grant Likely
Browse files

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: default avatarGrant 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>
parent 00aa3720

arch/powerpc/mm/numa.c

+1 −2
Original line number Diff line number Diff line
@@ -1711,12 +1711,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;

arch/powerpc/platforms/pseries/hotplug-cpu.c

+4 −3
Original line number Diff line number Diff line
@@ -340,16 +340,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);

arch/powerpc/platforms/pseries/hotplug-memory.c

+7 −8
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int pseries_add_mem_node(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;
@@ -232,22 +232,21 @@ 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) {

	case OF_RECONFIG_ATTACH_NODE:

		err = pseries_add_mem_node(node);

		err = pseries_add_mem_node(rd->dn);

		break;

	case OF_RECONFIG_DETACH_NODE:

		err = pseries_remove_mem_node(node);

		err = pseries_remove_mem_node(rd->dn);

		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);

arch/powerpc/platforms/pseries/iommu.c

+3 −2
Original line number Diff line number Diff line
@@ -1251,10 +1251,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;

arch/powerpc/platforms/pseries/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -251,9 +251,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;