blackfin: kgdb: call generic_exec_single() directly

sonicz · aet00 · commit 1439d030b903 · 2012-12-13T15:28:40.000+08:00
Current generic API smp_call_function_single() is changed to avoid raise IPI
and call function in IPI handler on the same core which is necessary to support
KGDB switch master core in SMP case, so call generic_exec_single() directly
instead of smp_call_function_single().

Signed-off-by: Sonic Zhang &lt;sonic.zhang@analog.com&gt;
Signed-off-by: Bob Liu &lt;lliubbo@gmail.com&gt;
diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
@@ -329,19 +329,28 @@ static void bfin_disable_hw_debug(struct pt_regs *regs)
 }
 
 #ifdef CONFIG_SMP
+extern void generic_exec_single(int cpu, struct call_single_data *data, int wait);
+static struct call_single_data kgdb_smp_ipi_data[NR_CPUS];
+
 void kgdb_passive_cpu_callback(void *info)
 {
 	kgdb_nmicallback(raw_smp_processor_id(), get_irq_regs());
 }
 
 void kgdb_roundup_cpus(unsigned long flags)
 {
-	smp_call_function(kgdb_passive_cpu_callback, NULL, 0);
+	unsigned int cpu;
+
+	for (cpu = cpumask_first(cpu_online_mask); cpu < nr_cpu_ids;
+		cpu = cpumask_next(cpu, cpu_online_mask)) {
+		kgdb_smp_ipi_data[cpu].func = kgdb_passive_cpu_callback;
+		generic_exec_single(cpu, &kgdb_smp_ipi_data[cpu], 0);
+	}
 }
 
 void kgdb_roundup_cpu(int cpu, unsigned long flags)
 {
-	smp_call_function_single(cpu, kgdb_passive_cpu_callback, NULL, 0);
+	generic_exec_single(cpu, &kgdb_smp_ipi_data[cpu], 0);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -329,19 +329,28 @@ static void bfin_disable_hw_debug(struct pt_regs *regs)`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`#ifdef CONFIG_SMP`
	`332`	`+extern void generic_exec_single(int cpu, struct call_single_data *data, int wait);`
	`333`	`+static struct call_single_data kgdb_smp_ipi_data[NR_CPUS];`
	`334`	`+`
`332`	`335`	`void kgdb_passive_cpu_callback(void *info)`
`333`	`336`	`{`
`334`	`337`	`kgdb_nmicallback(raw_smp_processor_id(), get_irq_regs());`
`335`	`338`	`}`
`336`	`339`
`337`	`340`	`void kgdb_roundup_cpus(unsigned long flags)`
`338`	`341`	`{`
`339`		`- smp_call_function(kgdb_passive_cpu_callback, NULL, 0);`
	`342`	`+ unsigned int cpu;`
	`343`	`+`
	`344`	`+ for (cpu = cpumask_first(cpu_online_mask); cpu < nr_cpu_ids;`
	`345`	`+ cpu = cpumask_next(cpu, cpu_online_mask)) {`
	`346`	`+ kgdb_smp_ipi_data[cpu].func = kgdb_passive_cpu_callback;`
	`347`	`+ generic_exec_single(cpu, &kgdb_smp_ipi_data[cpu], 0);`
	`348`	`+ }`
`340`	`349`	`}`
`341`	`350`
`342`	`351`	`void kgdb_roundup_cpu(int cpu, unsigned long flags)`
`343`	`352`	`{`
`344`		`- smp_call_function_single(cpu, kgdb_passive_cpu_callback, NULL, 0);`
	`353`	`+ generic_exec_single(cpu, &kgdb_smp_ipi_data[cpu], 0);`
`345`	`354`	`}`
`346`	`355`	`#endif`
`347`	`356`