public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc/pseries: Make query_cpu_stopped callable outside hotplug cpu

Browse source 
This moves query_cpu_stopped() out of the hotplug cpu code and into
smp.c so it can called in other places and renames it to
smp_query_cpu_stopped().

It also cleans up the return values by adding some #defines

Cc: <stable@kernel.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Neuling 2010-04-28 13:39:41 +00:00 • committed by Benjamin Herrenschmidt
parent a32fe93daf
commit f8b6769182
3 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
arch/powerpc/platforms/pseries/hotplug-cpu.c
View file

@ -154,30 +154,6 @@ static void pseries_mach_cpu_die(void)
for(;;); for(;;);
} }
static int qcss_tok; /* query-cpu-stopped-state token */
/* Get state of physical CPU.
* Return codes:
* 0 - The processor is in the RTAS stopped state
* 1 - stop-self is in progress
* 2 - The processor is not in the RTAS stopped state
* -1 - Hardware Error
* -2 - Hardware Busy, Try again later.
*/
static int query_cpu_stopped(unsigned int pcpu)
{
int cpu_status, status;
status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);
if (status != 0) {
printk(KERN_ERR
"RTAS query-cpu-stopped-state failed: %i\n", status);
return status;
}
return cpu_status;
}
static int pseries_cpu_disable(void) static int pseries_cpu_disable(void)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
@ -224,8 +200,9 @@ static void pseries_cpu_die(unsigned int cpu)
} else if (get_preferred_offline_state(cpu) == CPU_STATE_OFFLINE) { } else if (get_preferred_offline_state(cpu) == CPU_STATE_OFFLINE) {
for (tries = 0; tries < 25; tries++) { for (tries = 0; tries < 25; tries++) {
cpu_status = query_cpu_stopped(pcpu); cpu_status = smp_query_cpu_stopped(pcpu);
if (cpu_status == 0 || cpu_status == -1) if (cpu_status == QCSS_STOPPED ||
cpu_status == QCSS_HARDWARE_ERROR)
break; break;
cpu_relax(); cpu_relax();
} }
@ -388,6 +365,7 @@ static int __init pseries_cpu_hotplug_init(void)
struct device_node *np; struct device_node *np;
const char *typep; const char *typep;
int cpu; int cpu;
int qcss_tok;
for_each_node_by_name(np, "interrupt-controller") { for_each_node_by_name(np, "interrupt-controller") {
typep = of_get_property(np, "compatible", NULL); typep = of_get_property(np, "compatible", NULL);

8
arch/powerpc/platforms/pseries/plpar_wrappers.h
View file

@ -4,6 +4,14 @@
#include <asm/hvcall.h> #include <asm/hvcall.h>
#include <asm/page.h> #include <asm/page.h>
/* Get state of physical CPU from query_cpu_stopped */
int smp_query_cpu_stopped(unsigned int pcpu);
#define QCSS_STOPPED 0
#define QCSS_STOPPING 1
#define QCSS_NOT_STOPPED 2
#define QCSS_HARDWARE_ERROR -1
#define QCSS_HARDWARE_BUSY -2
static inline long poll_pending(void) static inline long poll_pending(void)
{ {
return plpar_hcall_norets(H_POLL_PENDING); return plpar_hcall_norets(H_POLL_PENDING);

22
arch/powerpc/platforms/pseries/smp.c
View file

@ -57,6 +57,28 @@
*/ */
static cpumask_t of_spin_map; static cpumask_t of_spin_map;
/* Query where a cpu is now. Return codes #defined in plpar_wrappers.h */
int smp_query_cpu_stopped(unsigned int pcpu)
{
int cpu_status, status;
int qcss_tok = rtas_token("query-cpu-stopped-state");
if (qcss_tok == RTAS_UNKNOWN_SERVICE) {
printk(KERN_INFO "Firmware doesn't support "
"query-cpu-stopped-state\n");
return QCSS_HARDWARE_ERROR;
}
status = rtas_call(qcss_tok, 1, 2, &cpu_status, pcpu);
if (status != 0) {
printk(KERN_ERR
"RTAS query-cpu-stopped-state failed: %i\n", status);
return status;
}
return cpu_status;
}
/** /**
* smp_startup_cpu() - start the given cpu * smp_startup_cpu() - start the given cpu
* *