ARM: pxa: fix building with clang
Subsystems (3)
PATCH v2 1/1 ARM: pxa: fix building with clang
From: Arnd Bergmann <[email protected]>
The integrated assembler in clang does not understand the xscale specific mra/mar instructions:
arch/arm/mach-pxa/pxa27x.c:136:15: error: unsupported architectural extension: xscale
asm volatile(".arch_extension xscale\n\t"arch/arm/mach-pxa/pxa27x.c:136:40: error: invalid instruction, did you mean: mcr, mla, mrc, mrs, msr?
mra r2, r3, acc0
Since these are coprocessor features, the same can be expressed using mrrc/mcrr, so use that for builds with IAS.
---
v2: this version should actually apply
--- arch/arm/mach-pxa/pxa27x.c | 8 ++++++++ arch/arm/mach-pxa/pxa3xx.c | 8 ++++++++ 2 files changed, 16 insertions(+)
arch/arm/mach-pxa/pxa27x.c +8 -0
@@ -133,8 +133,12 @@ void pxa27x_cpu_pm_enter(suspend_state_t state)#ifndef CONFIG_IWMMXT u64 acc0; +#ifndef CONFIG_AS_IS_LLVM asmvolatile (".arch_extension xscale\n\t" "mra %Q0, %R0, acc0" :"=r" (acc0)); +#else + asmvolatile ("mrrc p0, 0, %Q0, %R0, c0" :"=r" (acc0)); +#endif #endif /* ensure voltage-change sequencer not initiated, which hangs */
@@ -153,8 +157,12 @@ void pxa27x_cpu_pm_enter(suspend_state_t state)case PM_SUSPEND_MEM :cpu_suspend (pwrmode, pxa27x_finish_suspend);#ifndef CONFIG_IWMMXT +#ifndef CONFIG_AS_IS_LLVM asmvolatile (".arch_extension xscale\n\t" "mar acc0, %Q0, %R0" :"=r" (acc0)); +#else + asmvolatile ("mcrr p0, 0, %Q0, %R0, c0" ::"r" (acc0)); +#endif #endif break ; }
arch/arm/mach-pxa/pxa3xx.c +8 -0
@@ -108,8 +108,12 @@ static void pxa3xx_cpu_pm_suspend(void)#ifndef CONFIG_IWMMXT u64 acc0; +#ifdef CONFIG_CC_IS_GCC asmvolatile (".arch_extension xscale\n\t" "mra %Q0, %R0, acc0" :"=r" (acc0)); +#else + asmvolatile ("mrrc p0, 0, %Q0, %R0, c0" :"=r" (acc0)); +#endif #endif /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */
@@ -137,8 +141,12 @@ static void pxa3xx_cpu_pm_suspend(void)AD3ER =0 ;#ifndef CONFIG_IWMMXT +#ifndef CONFIG_AS_IS_LLVM asmvolatile (".arch_extension xscale\n\t" "mar acc0, %Q0, %R0" :"=r" (acc0)); +#else + asmvolatile ("mcrr p0, 0, %Q0, %R0, c0" ::"r" (acc0)); +#endif #endif }
Signature · 1 line
2.35.1
This patch was applied to soc/soc.git (arm/fixes) by Arnd Bergmann <[email protected]>:
Hello:
This patch was applied to soc/soc.git (arm/fixes)
by Arnd Bergmann <[email protected]>:
Quoted 11 lines · On Thu, 15 Dec 2022 17:25:14 +0100 you wrote:
From: Arnd Bergmann <[email protected]>
The integrated assembler in clang does not understand the xscale specific mra/mar instructions:
arch/arm/mach-pxa/pxa27x.c:136:15: error: unsupported architectural extension: xscale
asm volatile(".arch_extension xscale\n\t"arch/arm/mach-pxa/pxa27x.c:136:40: error: invalid instruction, did you mean: mcr, mla, mrc, mrs, msr?mra r2, r3, acc0[...]
Here is the summary with links:
- [v2] ARM: pxa: fix building with clang
https://git.kernel.org/soc/soc/c/4b88615950fc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html