[PATCH 2/4] msm: scm: Fix improper register assignment
From: Stephen Boyd <hidden>
Date: 2011-02-25 19:22:21
Also in:
linux-arm-msm, lkml
On 02/25/2011 05:23 AM, Will Deacon wrote:
On Thu, 2011-02-24 at 18:44 +0000, Stephen Boyd wrote:quoted
Assign the registers used in the inline assembly immediately before the inline assembly block. This ensures the compiler doesn't optimize away dead register assignments when it shouldn't. Signed-off-by: Stephen Boyd <redacted> --- arch/arm/mach-msm/scm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index ba57b5a..5eddf54 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c@@ -264,13 +264,16 @@ u32 scm_get_version(void) { int context_id; static u32 version = -1; - register u32 r0 asm("r0") = 0x1 << 8; - register u32 r1 asm("r1") = (u32)&context_id; + register u32 r0 asm("r0"); + register u32 r1 asm("r1"); if (version != -1) return version; mutex_lock(&scm_lock); + + r0 = 0x1 << 8; + r1 = (u32)&context_id; asm volatile( __asmeq("%0", "r1") __asmeq("%1", "r0")Whoa, have you seen the compiler `optimise' the original assignments away? Since there is a use in the asm block, the definition shouldn't be omitted. What toolchain are you using
Yes I've seen the r0 and r1 assignments get optimized away. I'm suspecting it's because the mutex_lock() is between the assignments and usage. I'm guessing the assignment to r0 and r1 are actually generated, but then they're optimized away because the mutex_lock() isn't inlined and thus r0 and r1 assigned to something that isn't &scm_lock can be "safely" removed (dead register assignments). I can't confirm any of this since I don't know what gcc is doing internally or even how to probe what it's doing (yeah I know I could go read gcc sources). Suggestions? I've seen it with two different compilers so far: gcc (Sourcery G++ Lite 2010.09-50) 4.5.1 arm-eabi-gcc (GCC) 4.4.0 -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.