arm: Replace CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6
PATCH 1/1 arm: Replace CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6
The TLS register is only available on V6 r1p0 and later. Test for it and use it if available.
Signed-off-by Tony Lindgren <[email protected]>
arch/arm/include/asm/hwcap.h +1 -0
@@ -19,6 +19,7 @@#define HWCAP_NEON 4096#define HWCAP_VFPv3 8192#define HWCAP_VFPv3D16 16384 +#define HWCAP_TLS 32768#if defined(__KERNEL__) && !defined(__ASSEMBLY__)/*
arch/arm/kernel/entry-armv.S +11 -12
@@ -739,11 +739,13 @@ ENTRY(__switch_to) #ifdef CONFIG_MMU ldr r6, [r2, #TI_CPU_DOMAIN] #endif -#if defined(CONFIG_HAS_TLS_REG) - mcr p15, 0, r3, c13, c0, 3 @ set TLS register -#elif !defined(CONFIG_TLS_REG_EMUL) - mov r4, #0xffff0fff - str r3, [r4, #-15] @ TLS val at 0xffff0ff0 +#if !defined(CONFIG_TLS_REG_EMUL) + ldr r4, =elf_hwcap + ldr r4, [r4, #0] + tst r4, #HWCAP_TLS @ hardware with TLS? + mcrne p15, 0, r3, c13, c0, 3 @ set TLS register + moveq r4, #0xffff0fff + streq r3, [r4, #-15] @ TLS val at 0xffff0ff0 #endif #ifdef CONFIG_MMU mcr p15, 0, r6, c3, c0, 0 @ Set domain register
@@ -1009,15 +1011,12 @@ kuser_cmpxchg_fixup: */ __kuser_get_tls: @ 0xffff0fe0 - -#if !defined(CONFIG_HAS_TLS_REG) && !defined(CONFIG_TLS_REG_EMUL) - ldr r0, [pc, #(16 - 8)] @ TLS stored at 0xffff0ff0 -#else - mrc p15, 0, r0, c13, c0, 3 @ read TLS register -#endif + ldr r0, [pc, #(16 - 8)] @ TLS set at 0xffff0ff0? + cmp r0, #0 @ assume hw TLS if not set + mrceq p15, 0, r0, c13, c0, 3 @ read TLS register usr_ret lr - .rep 5 + .rep 3 .word 0 @ pad up to __kuser_helper_version .endr
arch/arm/kernel/setup.c +20 -0
@@ -269,6 +269,24 @@ static void __init cacheid_init(void)extern struct proc_info_list *lookup_processor_type (unsigned int );extern struct machine_desc *lookup_machine_type (unsigned int ); +#ifdef CONFIG_CPU_V6 +static void __init feat_v6_fixup (void ) +{ +int id =read_cpuid_id (); + +if (id &0x000f0000 !=0x00070000 ) +return ; + +/* HWCAP_TLS is available only on V6 r1p0 and later */ +if (((id >>20 ) &3 ) ==0 ) + elf_hwcap &= ~HWCAP_TLS ; +} +#else +static inline void feat_v6_fixup (void ) +{ +} +#endif +static void __init setup_processor (void ) {struct proc_info_list *list;
@@ -311,6 +329,8 @@ static void __init setup_processor(void) elf_hwcap &= ~HWCAP_THUMB ;#endif +feat_v6_fixup (); +cacheid_init ();cpu_proc_init (); }
arch/arm/kernel/traps.c +13 -10
@@ -518,16 +518,19 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)case NR (set_tls): thread->tp_value = regs->ARM_r0; -#if defined(CONFIG_HAS_TLS_REG ) - asm ("mcr p15, 0, %0, c13, c0, 3" : :"r" (regs->ARM_r0) ); -#elif !defined(CONFIG_TLS_REG_EMUL ) -/* -* User space must never try to access this directly. -* Expect your app to break eventually if you do so. -* The user helper at 0xffff0fe0 must be used instead. -* (see entry-armv.S for details) -*/ - *((unsigned int *)0xffff0ff0 ) = regs->ARM_r0; +#if !defined(CONFIG_TLS_REG_EMUL ) +if (elf_hwcap &HWCAP_TLS ) { + asm ("mcr p15, 0, %0, c13, c0, 3" + : :"r" (regs->ARM_r0)); + }else { +/* +* User space must never try to access this directly. +* Expect your app to break eventually if you do so. +* The user helper at 0xffff0fe0 must be used instead. +* (see entry-armv.S for details) +*/ + *((unsigned int *)0xffff0ff0 ) = regs->ARM_r0; + }#endif return 0 ;
arch/arm/mm/Kconfig +0 -11
@@ -715,17 +715,6 @@ config TLS_REG_EMUL a few prototypes like that in existence) and therefore access to that required register must be emulated. -config HAS_TLS_REG - bool - depends on !TLS_REG_EMUL - default y if SMP || CPU_32v7 - help - This selects support for the CP15 thread register. - It is defined to be available on some ARMv6 processors (including - all SMP capable ARMv6's) or later processors. User space may - assume directly accessing that register and always obtain the - expected value only on ARMv7 and above. - config NEEDS_SYSCALL_FOR_CMPXCHG bool help
arch/arm/mm/proc-v6.S +4 -2
@@ -239,7 +239,8 @@ __v6_proc_info: b __v6_setup .long cpu_arch_name .long cpu_elf_name - .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA + /* See also feat_v6_fixup() for HWCAP_TLS */ + .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA|HWCAP_TLS .long cpu_v6_name .long v6_processor_functions .long v6wbi_tlb_fns
@@ -262,7 +263,8 @@ __pj4_v6_proc_info: b __v6_setup .long cpu_arch_name .long cpu_elf_name - .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP + /* See also feat_v6_fixup() for HWCAP_TLS */ + .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS .long cpu_pj4_name .long v6_processor_functions .long v6wbi_tlb_fns
arch/arm/mm/proc-v7.S +1 -1
@@ -344,7 +344,7 @@ __v7_proc_info: b __v7_setup .long cpu_arch_name .long cpu_elf_name - .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP + .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS .long cpu_v7_name .long v7_processor_functions .long v7wbi_tlb_fns
--jB+02Y6wHc2pEa2x--