ARM: tegra: call cpu_do_idle from C code

arndb · arndb · commit 2058842e6d78 · 2013-04-29T16:51:59.000+02:00
When building a kernel for multiple CPU architecture levels,
cpu_do_idle() is a macro for an indirect function call, which
cannot be called from assembly code as Tegra does.

Adding a trivial C wrapper for this function lets us build
a tegra kernel with ARMv6 support enabled.

Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
Acked-by: Joseph Lo &lt;josephl@nvidia.com&gt;
Cc: Stephen Warren &lt;swarren@nvidia.com&gt;
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
@@ -162,6 +162,11 @@ bool tegra_set_cpu_in_lp2(int phy_cpu_id)
 	return last_cpu;
 }
 
+int tegra_cpu_do_idle(void)
+{
+	return cpu_do_idle();
+}
+
 static int tegra_sleep_cpu(unsigned long v2p)
 {
 	/* Switch to the identity mapping. */
diff --git a/arch/arm/mach-tegra/sleep-tegra20.S b/arch/arm/mach-tegra/sleep-tegra20.S
@@ -197,7 +197,7 @@ ENTRY(tegra20_sleep_cpu_secondary_finish)
 	mov	r3, #CPU_RESETTABLE
 	str	r3, [r0]
 
-	bl	cpu_do_idle
+	bl	tegra_cpu_do_idle
 
 	/*
 	 * cpu may be reset while in wfi, which will return through

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,11 @@ bool tegra_set_cpu_in_lp2(int phy_cpu_id)`
`162`	`162`	`return last_cpu;`
`163`	`163`	`}`
`164`	`164`
	`165`	`+int tegra_cpu_do_idle(void)`
	`166`	`+{`
	`167`	`+ return cpu_do_idle();`
	`168`	`+}`
	`169`	`+`
`165`	`170`	`static int tegra_sleep_cpu(unsigned long v2p)`
`166`	`171`	`{`
`167`	`172`	`/* Switch to the identity mapping. */`