ARM: kexec: Add missing memory clobber to inline asm in crash_setup_regs()
PATCH 1/2 ARM: kexec: Add missing memory clobber to inline asm in crash_setup_regs()
Currently, the inline asm is passed &newregs->ARM_r0 as in input, when modifying multiple fields of newregs.
It's plausible to assume that GCC will assume newregs->ARM_r0 is modified when passed the address, but unfortunately this assumption is incorrect.
Also, GCC has no way to guess that the other ARM_r* fields are modified without the addition of a "memory" clobber.
Applies cleanly on v2.6.37-rc1.
--- arch/arm/include/asm/kexec.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/include/asm/kexec.h +1 -1
@@ -34,7 +34,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs,memcpy (newregs, oldregs,sizeof (*newregs)); }else { __asm__ __volatile__ ("stmia %0, {r0 - r15}" - : :"r" (&newregs->ARM_r0)); + : :"r" (&newregs->ARM_r0) :"memory" ); __asm__ __volatile__ ("mrs %0, cpsr" :"=r" (newregs->ARM_cpsr)); }
Signature · 1 line
1.7.1
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
* Fix kexec build failure with CONFIG_THUMB2_KERNEL.
* Avoids deprecated/forbidden sp and pc usage in for ARMv7 onwards,
retaining compatibility with older architecture versions.
* The pc value saved to newregs is now aligned on a predictable
instruction boundary.
(stmia { ... pc } or str pc has implementation-defined results in most versions of the ARM architecutre, and is prohibited (unpredictable) in Thumb-2.)
* Switch to named inline asm arguments (else I get readily confused ...)
The resulting code should be compatible with all architecture versions >= v3, with or without CONFIG_THUMB2_KERNEL.
Applies cleanly on v2.6.37-rc1.
--- arch/arm/include/asm/kexec.h | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-)
arch/arm/include/asm/kexec.h +14 -4
@@ -33,10 +33,20 @@ static inline void crash_setup_regs(struct pt_regs *newregs,if (oldregs) {memcpy (newregs, oldregs,sizeof (*newregs)); }else { - __asm__ __volatile__ ("stmia %0, {r0 - r15}" - : :"r" (&newregs->ARM_r0) :"memory" ); - __asm__ __volatile__ ("mrs %0, cpsr" - :"=r" (newregs->ARM_cpsr)); + __asm__ __volatile__ ( +"stmia %[regs_base], {r0-r12}\n\t" +"mov %[_ARM_sp], sp\n\t" +"str lr, %[_ARM_lr]\n\t" +"adr %[_ARM_pc], 1f\n\t" +"mrs %[_ARM_cpsr], cpsr\n\t" +"1:" + : [_ARM_pc]"=r" (newregs->ARM_pc), + [_ARM_cpsr]"=r" (newregs->ARM_cpsr), + [_ARM_sp]"=r" (newregs->ARM_sp), + [_ARM_lr]"=o" (newregs->ARM_lr) + : [regs_base]"r" (&newregs->ARM_r0) + :"memory" + ); } }
Signature · 1 line
1.7.1
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
Hi,
Quoted 12 lines · Dave Martin
* Fix kexec build failure with
CONFIG_THUMB2_KERNEL.* Avoids deprecated/forbidden sp and pc usage in for ARMv7 onwards,
retaining compatibility with older architecture versions.* The pc value saved to newregs is now aligned on a predictable
instruction boundary.(stmia { ... pc } or str pc has implementation-defined results in most versions of the ARM architecutre, and is prohibited (unpredictable) in Thumb-2.)
Quoted 6 lines
* Switch to named inline asm arguments (else I get readily confused ...)
The resulting code should be compatible with all architecture versions >= v3, with or without
CONFIG_THUMB2_KERNEL.Applies cleanly on v2.6.37-rc1.
Quickly tested this and seems to work. So FWIW:
Quoted 39 lines
Signed-off-by Dave Martin <[email protected]>Acked-by Catalin Marinas <[email protected]>Reviewed-by Will Deacon <[email protected]>--- arch/arm/include/asm/kexec.h | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-)arch/arm/include/asm/kexec.h +14
-4@@ -33,10 +33,20 @@ static inline void crash_setup_regs(struct pt_regs *newregs,if (oldregs) {memcpy (newregs, oldregs,sizeof (*newregs)); }else { - __asm__ __volatile__ ("stmia %0, {r0 - r15}" - : :"r" (&newregs->ARM_r0) :"memory" ); - __asm__ __volatile__ ("mrs %0, cpsr" - :"=r" (newregs->ARM_cpsr)); + __asm__ __volatile__ ( +"stmia %[regs_base], {r0-r12}\n\t" +"mov %[_ARM_sp], sp\n\t" +"str lr, %[_ARM_lr]\n\t" +"adr %[_ARM_pc], 1f\n\t" +"mrs %[_ARM_cpsr], cpsr\n\t" +"1:" + : [_ARM_pc]"=r" (newregs->ARM_pc), + [_ARM_cpsr]"=r" (newregs->ARM_cpsr), + [_ARM_sp]"=r" (newregs->ARM_sp), + [_ARM_lr]"=o" (newregs->ARM_lr) + : [regs_base]"r" (&newregs->ARM_r0) + :"memory" + ); } }Signature · 1 line
1.7.1
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
Quoted 15 lines · Mika Westerberg
Quoted 14 lines · Dave Martin
?* Fix kexec build failure with
CONFIG_THUMB2_KERNEL.?* Avoids deprecated/forbidden sp and pc usage in for ARMv7 onwards, retaining compatibility with older architecture versions.
?* The pc value saved to newregs is now aligned on a predictable instruction boundary.
(stmia { ... pc } or str pc has implementation-defined results in most versions of the ARM architecutre, and is prohibited (unpredictable) in Thumb-2.)
?* Switch to named inline asm arguments (else I get readily confused ...)
Quoted 8 lines
Quoted 4 lines
The resulting code should be compatible with all architecture versions >= v3, with or without
CONFIG_THUMB2_KERNEL.Applies cleanly on v2.6.37-rc1.
Quickly tested this and seems to work. So FWIW:
Acked-by Mika Westerberg <[email protected]>
It's more like Tested-by :) (unless you reviewed it as well, though there seems to be some confusion between Reviewed-by and Acked-by).
Signature · 1 line
Catalin
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
Quoted 1 line · Catalin Marinas
On 17 November 2010 13:11, Mika Westerberg <[email protected]> wrote:
[...]
Quoted 7 lines
Quoted 4 lines
Quickly tested this and seems to work. So FWIW:
Acked-by Mika Westerberg <[email protected]>It's more like Tested-by :) (unless you reviewed it as well, though there seems to be some confusion between Reviewed-by and Acked-by).
Well, I was the original author if this code so I thought that Acked-by was right but Tested-by is fine :)
Regards,
MW
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
Quoted 6 lines · Mika Westerberg
Quoted 1 line · Catalin Marinas
On 17 November 2010 13:11, Mika Westerberg <[email protected]> wrote:
[...]
Quoted 3 lines
Quoted 3 lines
Quickly tested this and seems to work. So FWIW:
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Acked-by Mika Westerberg <[email protected]>It's more like Tested-by :) ?(unless you reviewed it as well, though there seems to be some confusion between Reviewed-by and Acked-by).
Well, I was the original author if this code so I thought that Acked-by was right but Tested-by is fine :)
We can have both Tested-by and Acked-by then :)
Signature · 1 line
Catalin
PATCH 2/2 ARM: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL
In reply to Mika WesterbergQuoted 6 lines · Mika Westerberg
Quoted 1 line · Catalin Marinas
On 17 November 2010 13:11, Mika Westerberg <[email protected]> wrote:
[...]
Quoted 3 lines
Quoted 3 lines
Quickly tested this and seems to work. So FWIW:
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Acked-by Mika Westerberg <[email protected]>It's more like Tested-by :) (unless you reviewed it as well, though there seems to be some confusion between Reviewed-by and Acked-by).
Well, I was the original author if this code so I thought that Acked-by was right but Tested-by is fine :)
Well, I don't know either ... so I'll make it Tested-by for now if that's OK.
Thanks for trying it out, anyway.
---Dave