Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIPS] SMP: Implement smp_call_function_mask().

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-10-03 01:24:16 +01:00
parent 9966db25de
commit bd6aeeffcc
3 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/mips/kernel/gdb-stub.c
View File

@ -676,15 +676,18 @@ static void kgdb_wait(void *arg)
static int kgdb_smp_call_kgdb_wait(void) static int kgdb_smp_call_kgdb_wait(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
cpumask_t mask = cpu_online_map;
struct call_data_struct data; struct call_data_struct data;
int i, cpus = num_online_cpus() - 1;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
int cpus;
/* /*
* Can die spectacularly if this CPU isn't yet marked online * Can die spectacularly if this CPU isn't yet marked online
*/ */
BUG_ON(!cpu_online(cpu)); BUG_ON(!cpu_online(cpu));
cpu_clear(cpu, mask);
cpus = cpus_weight(mask);
if (!cpus) if (!cpus)
return 0; return 0;
@ -711,10 +714,7 @@ static int kgdb_smp_call_kgdb_wait(void)
call_data = &data; call_data = &data;
mb(); mb();
/* Send a message to all other CPUs and wait for them to respond */ core_send_ipi_mask(mask, SMP_CALL_FUNCTION);
for (i = 0; i < NR_CPUS; i++)
if (cpu_online(i) && i != cpu)
core_send_ipi(i, SMP_CALL_FUNCTION);
/* Wait for response */ /* Wait for response */
/* FIXME: lock-up detection, backtrace on lock-up */ /* FIXME: lock-up detection, backtrace on lock-up */

51
arch/mips/kernel/smp.c
View File

@ -97,6 +97,8 @@ struct call_data_struct *call_data;
/* /*
* Run a function on all other CPUs. * Run a function on all other CPUs.
*
* <mask> cpuset_t of all processors to run the function on.
* <func> The function to run. This must be fast and non-blocking. * <func> The function to run. This must be fast and non-blocking.
* <info> An arbitrary pointer to pass to the function. * <info> An arbitrary pointer to pass to the function.
* <retry> If true, keep retrying until ready. * <retry> If true, keep retrying until ready.
@ -121,18 +123,20 @@ struct call_data_struct *call_data;
* Spin waiting for call_lock * Spin waiting for call_lock
* Deadlock Deadlock * Deadlock Deadlock
*/ */
int smp_call_function (void (*func) (void *info), void *info, int retry, int smp_call_function_mask(cpumask_t mask, void (*func) (void *info),
int wait) void *info, int retry, int wait)
{ {
struct call_data_struct data; struct call_data_struct data;
int i, cpus = num_online_cpus() - 1;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
int cpus;
/* /*
* Can die spectacularly if this CPU isn't yet marked online * Can die spectacularly if this CPU isn't yet marked online
*/ */
BUG_ON(!cpu_online(cpu)); BUG_ON(!cpu_online(cpu));
cpu_clear(cpu, mask);
cpus = cpus_weight(mask);
if (!cpus) if (!cpus)
return 0; return 0;
@ -151,9 +155,7 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
smp_mb(); smp_mb();
/* Send a message to all other CPUs and wait for them to respond */ /* Send a message to all other CPUs and wait for them to respond */
for_each_online_cpu(i) core_send_ipi_mask(mask, SMP_CALL_FUNCTION);
if (i != cpu)
core_send_ipi(i, SMP_CALL_FUNCTION);
/* Wait for response */ /* Wait for response */
/* FIXME: lock-up detection, backtrace on lock-up */ /* FIXME: lock-up detection, backtrace on lock-up */
@ -169,6 +171,11 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
return 0; return 0;
} }
int smp_call_function(void (*func) (void *info), void *info, int retry,
int wait)
{
return smp_call_function_mask(cpu_online_map, func, info, retry, wait);
}
void smp_call_function_interrupt(void) void smp_call_function_interrupt(void)
{ {
@ -199,8 +206,7 @@ void smp_call_function_interrupt(void)
int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
int retry, int wait) int retry, int wait)
{ {
struct call_data_struct data; int ret, me;
int me;
/* /*
* Can die spectacularly if this CPU isn't yet marked online * Can die spectacularly if this CPU isn't yet marked online
@ -219,33 +225,8 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
return 0; return 0;
} }
/* Can deadlock when called with interrupts disabled */ ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, retry,
WARN_ON(irqs_disabled()); wait);
data.func = func;
data.info = info;
atomic_set(&data.started, 0);
data.wait = wait;
if (wait)
atomic_set(&data.finished, 0);
spin_lock(&smp_call_lock);
call_data = &data;
smp_mb();
/* Send a message to the other CPU */
core_send_ipi(cpu, SMP_CALL_FUNCTION);
/* Wait for response */
/* FIXME: lock-up detection, backtrace on lock-up */
while (atomic_read(&data.started) != 1)
barrier();
if (wait)
while (atomic_read(&data.finished) != 1)
barrier();
call_data = NULL;
spin_unlock(&smp_call_lock);
put_cpu(); put_cpu();
return 0; return 0;

9
include/asm-mips/smp.h
View File

@ -60,6 +60,15 @@ extern cpumask_t phys_cpu_present_map;
*/ */
extern void core_send_ipi(int cpu, unsigned int action); extern void core_send_ipi(int cpu, unsigned int action);
static inline void core_send_ipi_mask(cpumask_t mask, unsigned int action)
{
unsigned int i;
for_each_cpu_mask(i, mask)
core_send_ipi(i, action);
}
/* /*
* Firmware CPU startup hook * Firmware CPU startup hook
*/ */