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

Commit e36d1227 authored by Thomas Falcon's avatar Thomas Falcon Committed by Michael Ellerman
Browse files

pseries: Fix endian issues in cpu hot-removal 



When removing a cpu, this patch makes sure that values
gotten from or passed to firmware are in the correct
endian format.

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 822e7122

arch/powerpc/platforms/pseries/dlpar.c

+11 −9
Original line number Diff line number Diff line
@@ -445,7 +445,8 @@ static int dlpar_offline_cpu(struct device_node *dn) 
	int rc = 0;

	unsigned int cpu;

	int len, nthreads, i;

	const u32 *intserv;

	const __be32 *intserv;

	u32 thread;



	intserv = of_get_property(dn, "ibm,ppc-interrupt-server#s", &len);

	if (!intserv)
@@ -455,8 +456,9 @@ static int dlpar_offline_cpu(struct device_node *dn) 


	cpu_maps_update_begin();

	for (i = 0; i < nthreads; i++) {

		thread = be32_to_cpu(intserv[i]);

		for_each_present_cpu(cpu) {

			if (get_hard_smp_processor_id(cpu) != intserv[i])

			if (get_hard_smp_processor_id(cpu) != thread)

				continue;



			if (get_cpu_current_state(cpu) == CPU_STATE_OFFLINE)
@@ -478,14 +480,14 @@ static int dlpar_offline_cpu(struct device_node *dn) 
			 * Upgrade it's state to CPU_STATE_OFFLINE.

			 */

			set_preferred_offline_state(cpu, CPU_STATE_OFFLINE);

			BUG_ON(plpar_hcall_norets(H_PROD, intserv[i])

			BUG_ON(plpar_hcall_norets(H_PROD, thread)

								!= H_SUCCESS);

			__cpu_die(cpu);

			break;

		}

		if (cpu == num_possible_cpus())

			printk(KERN_WARNING "Could not find cpu to offline "

			       "with physical id 0x%x\n", intserv[i]);

			       "with physical id 0x%x\n", thread);

	}

	cpu_maps_update_done();
@@ -497,15 +499,15 @@ static int dlpar_offline_cpu(struct device_node *dn) 
static ssize_t dlpar_cpu_release(const char *buf, size_t count)

{

	struct device_node *dn;

	const u32 *drc_index;

	u32 drc_index;

	int rc;



	dn = of_find_node_by_path(buf);

	if (!dn)

		return -EINVAL;



	drc_index = of_get_property(dn, "ibm,my-drc-index", NULL);

	if (!drc_index) {

	rc = of_property_read_u32(dn, "ibm,my-drc-index", &drc_index);

	if (rc) {

		of_node_put(dn);

		return -EINVAL;

	}
@@ -516,7 +518,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count) 
		return -EINVAL;

	}



	rc = dlpar_release_drc(*drc_index);

	rc = dlpar_release_drc(drc_index);

	if (rc) {

		of_node_put(dn);

		return rc;
@@ -524,7 +526,7 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count) 


	rc = dlpar_detach_node(dn);

	if (rc) {

		dlpar_acquire_drc(*drc_index);

		dlpar_acquire_drc(drc_index);

		return rc;

	}

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

+6 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void rtas_stop_self(void) 
{

	static struct rtas_args args = {

		.nargs = 0,

		.nret = 1,

		.nret = cpu_to_be32(1),

		.rets = &args.args[0],

	};
@@ -312,7 +312,8 @@ static void pseries_remove_processor(struct device_node *np) 
{

	unsigned int cpu;

	int len, nthreads, i;

	const u32 *intserv;

	const __be32 *intserv;

	u32 thread;



	intserv = of_get_property(np, "ibm,ppc-interrupt-server#s", &len);

	if (!intserv)
@@ -322,8 +323,9 @@ static void pseries_remove_processor(struct device_node *np) 


	cpu_maps_update_begin();

	for (i = 0; i < nthreads; i++) {

		thread = be32_to_cpu(intserv[i]);

		for_each_present_cpu(cpu) {

			if (get_hard_smp_processor_id(cpu) != intserv[i])

			if (get_hard_smp_processor_id(cpu) != thread)

				continue;

			BUG_ON(cpu_online(cpu));

			set_cpu_present(cpu, false);
@@ -332,7 +334,7 @@ static void pseries_remove_processor(struct device_node *np) 
		}

		if (cpu >= nr_cpu_ids)

			printk(KERN_WARNING "Could not find cpu to remove "

			       "with physical id 0x%x\n", intserv[i]);

			       "with physical id 0x%x\n", thread);

	}

	cpu_maps_update_done();

}