[PATCH 1/2] arm: Replace CONFIG_HAS_TLS_REG with HWCAP_TLS and check for it on V6
nico at fluxnic.net
Wed Jun 30 10:42:18 EDT 2010
On Wed, 30 Jun 2010, Tony Lindgren wrote:
> * Tony Lindgren <tony at atomide.com> [100630 14:02]:
> > * Nicolas Pitre <nico at fluxnic.net> [100629 22:14]:
> > Updated patch below.
> And a bug crept in..
> > + .macro set_tls_v6, tp, tmp1, tmp2
> > + ldr \tmp1, =elf_hwcap
> > + ldr \tmp1, [\tmp1, #0]
> > + mov \tmp2, #0xffff0fff
> > + tst \tmp2, #HWCAP_TLS @ hardware TLS available?
> > + mcrne p15, 0, \tp, c13, c0, 3 @ yes, set TLS register
> > + streq \tp, [\tmp2, #-15] @ set TLS value at 0xffff0ff0
> > + .endm
> The tst \tmp2, #HWCAP_TLS should of course use \tmp1.
> Also fixed a warning about adding parentheses around comparison
> if (id & 0x410f0000) != 0x41070000).
Here you probably want (id & 0xff0f0000) and not (id & 0x410f0000).
> Again, updated patch below.
I like it. However, in proc-v6.S, you don't need to add a reference to
feat_v6_fixup() to the __pj4_v6_proc_info block. Simply adding
HWCAP_TLS in that case should be fine as PJ4 always has the TLS reg.
With the above fixes, you can add
Reviewed-by: Nicolas Pitre <nicolas.pitre at linaro.org>
More information about the linux-arm-kernel