Fix : [Bug 887516] [NEW] VFP support reported for the PXA270
PATCH v6 1/1 Fix : [Bug 887516] [NEW] VFP support reported for the PXA270
A VFP was detected for pxa270 causing an "Illegal instruction" exception.
The eglibc was not receiving the right AT_HWCAP from elfloader.c.
In this version :
Fix macro coding style issue
Benoît Canet (2):
arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features.
target-arm: remind to keep arm features in sync with
linux-user/elfload.c
linux-user/elfload.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- target-arm/cpu.h | 4 ++++ 2 files changed, 46 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 2/2 target-arm: remind to keep arm features in sync with linux-user/elfload.c
--- target-arm/cpu.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
target-arm/cpu.h +4 -0
@@ -353,6 +353,10 @@ enum arm_cpu_mode {#define ARM_IWMMXT_wCGR2 10#define ARM_IWMMXT_wCGR3 11 +/* If adding a feature bit which corresponds to a Linux ELF +* HWCAP bit, remember to update the feature-bit-to-hwcap +* mapping in linux-user/elfload.c:get_elf_hwcap(). +*/ enum arm_features {ARM_FEATURE_VFP ,ARM_FEATURE_AUXCR ,/* ARM1026 Auxiliary control register. */
Signature · 1 line
1.7.5.4
PATCH 1/2 arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features.
In reply to Benoît CanetThe cpu capabilities passed by the elf loader in AT_HWCAP were a constant.
Make AT_HWCAP reflect the emulated cpu features in order to give correct clues to eglibc.
Fix : [Bug 887516] [NEW] VFP support reported for the PXA270
--- linux-user/elfload.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-)
linux-user/elfload.c +42 -4
@@ -330,6 +330,10 @@ enumARM_HWCAP_ARM_NEON =1 <<11 , ARM_HWCAP_ARM_VFPv3 =1 <<12 , ARM_HWCAP_ARM_VFPv3D16 =1 <<13 , +ARM_HWCAP_ARM_TLS =1 <<14 , + ARM_HWCAP_ARM_VFPv4 =1 <<15 , +ARM_HWCAP_ARM_IDIVA =1 <<16 , + ARM_HWCAP_ARM_IDIVT = 1 << 17, };#define TARGET_HAS_GUEST_VALIDATE_BASE
@@ -375,10 +379,44 @@ bool guest_validate_base(unsigned long guest_base) return 1; /* All good */ } -#define ELF_HWCAP (ARM_HWCAP_ARM_SWP | ARM_HWCAP_ARM_HALF \ - | ARM_HWCAP_ARM_THUMB | ARM_HWCAP_ARM_FAST_MULT \ - | ARM_HWCAP_ARM_FPA | ARM_HWCAP_ARM_VFP \ - | ARM_HWCAP_ARM_NEON | ARM_HWCAP_ARM_VFPv3 ) + +#define ELF_HWCAP get_elf_hwcap() + +static uint32_t get_elf_hwcap (void ) +{ +CPUState *e = thread_env; +uint32_t hwcaps =0 ; + + hwcaps |=ARM_HWCAP_ARM_SWP ; + hwcaps |=ARM_HWCAP_ARM_HALF ; + hwcaps |=ARM_HWCAP_ARM_THUMB ; + hwcaps |=ARM_HWCAP_ARM_FAST_MULT ; + +/* probe for the extra features */ +#define SET_HWCAP (feat, hwcap) do { \ + if (arm_feature(e, feat)) { \ + hwcaps |= hwcap; \ + } \ + } while (0) +SET_HWCAP (ARM_FEATURE_VFP ,ARM_HWCAP_ARM_VFP ); +SET_HWCAP (ARM_FEATURE_IWMMXT ,ARM_HWCAP_ARM_IWMMXT ); +SET_HWCAP (ARM_FEATURE_THUMB2EE ,ARM_HWCAP_ARM_THUMBEE ); +SET_HWCAP (ARM_FEATURE_NEON ,ARM_HWCAP_ARM_NEON ); +SET_HWCAP (ARM_FEATURE_VFP3 , ARM_HWCAP_ARM_VFPv3); + +/* Strictly should be ARM_FEATURE_V5TE but we don't distinguish +* as all our v5 cores are v5TE at the moment +*/ +SET_HWCAP (ARM_FEATURE_V5 ,ARM_HWCAP_ARM_EDSP ); + +SET_HWCAP (ARM_FEATURE_V6K ,ARM_HWCAP_ARM_TLS ); +SET_HWCAP (ARM_FEATURE_VFP4 , ARM_HWCAP_ARM_VFPv4); +SET_HWCAP (ARM_FEATURE_ARM_DIV ,ARM_HWCAP_ARM_IDIVA ); +SET_HWCAP (ARM_FEATURE_THUMB_DIV ,ARM_HWCAP_ARM_IDIVT ); +#undef SET_HWCAP + +return hwcaps; +}#endif
Signature · 1 line
1.7.5.4
Re: [Qemu-devel] [PATCH 1/2] arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features.
Am 09.11.2011 18:03, schrieb Benoît Canet:
Quoted 8 lines
The cpu capabilities passed by the elf loader in
AT_HWCAPwere a constant.
MakeAT_HWCAPreflect the emulated cpu features in order to give correct clues to eglibc.Fix : [Bug 887516] [NEW] VFP support reported for the PXA270
Signed-off-by Benoit Canet <[email protected]>
Thanks for your patience,
Andreas
Quoted 68 lines
--- linux-user/elfload.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-)linux-user/elfload.c +42
-4@@ -330,6 +330,10 @@ enumARM_HWCAP_ARM_NEON =1 <<11 , ARM_HWCAP_ARM_VFPv3 =1 <<12 , ARM_HWCAP_ARM_VFPv3D16 =1 <<13 , +ARM_HWCAP_ARM_TLS =1 <<14 , + ARM_HWCAP_ARM_VFPv4 =1 <<15 , +ARM_HWCAP_ARM_IDIVA =1 <<16 , + ARM_HWCAP_ARM_IDIVT = 1 << 17, };#define TARGET_HAS_GUEST_VALIDATE_BASE @@ -375,10 +379,44 @@ bool guest_validate_base(unsigned long guest_base) return 1; /* All good */ } -#define ELF_HWCAP (ARM_HWCAP_ARM_SWP | ARM_HWCAP_ARM_HALF \ - | ARM_HWCAP_ARM_THUMB | ARM_HWCAP_ARM_FAST_MULT \ - | ARM_HWCAP_ARM_FPA | ARM_HWCAP_ARM_VFP \ - | ARM_HWCAP_ARM_NEON | ARM_HWCAP_ARM_VFPv3 ) + +#define ELF_HWCAP get_elf_hwcap() + +static uint32_t get_elf_hwcap (void ) +{ +CPUState *e = thread_env; +uint32_t hwcaps =0 ; + + hwcaps |=ARM_HWCAP_ARM_SWP ; + hwcaps |=ARM_HWCAP_ARM_HALF ; + hwcaps |=ARM_HWCAP_ARM_THUMB ; + hwcaps |=ARM_HWCAP_ARM_FAST_MULT ; + +/* probe for the extra features */ +#define SET_HWCAP (feat, hwcap) do { \ + if (arm_feature(e, feat)) { \ + hwcaps |= hwcap; \ + } \ + } while (0) +SET_HWCAP (ARM_FEATURE_VFP ,ARM_HWCAP_ARM_VFP ); +SET_HWCAP (ARM_FEATURE_IWMMXT ,ARM_HWCAP_ARM_IWMMXT ); +SET_HWCAP (ARM_FEATURE_THUMB2EE ,ARM_HWCAP_ARM_THUMBEE ); +SET_HWCAP (ARM_FEATURE_NEON ,ARM_HWCAP_ARM_NEON ); +SET_HWCAP (ARM_FEATURE_VFP3 , ARM_HWCAP_ARM_VFPv3); + +/* Strictly should be ARM_FEATURE_V5TE but we don't distinguish +* as all our v5 cores are v5TE at the moment +*/ +SET_HWCAP (ARM_FEATURE_V5 ,ARM_HWCAP_ARM_EDSP ); + +SET_HWCAP (ARM_FEATURE_V6K ,ARM_HWCAP_ARM_TLS ); +SET_HWCAP (ARM_FEATURE_VFP4 , ARM_HWCAP_ARM_VFPv4); +SET_HWCAP (ARM_FEATURE_ARM_DIV ,ARM_HWCAP_ARM_IDIVA ); +SET_HWCAP (ARM_FEATURE_THUMB_DIV ,ARM_HWCAP_ARM_IDIVT ); +#undef SET_HWCAP + +return hwcaps; +}#endif
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 2/2] target-arm: remind to keep arm features in sync with linux-user/elfload.c
In reply to Benoît Canet2011/11/9 Benoît Canet <[email protected]>:
Quoted 1 line
Signed-off-by Benoit Canet <[email protected]>
-- PMM
Re: [Qemu-devel] [PATCH 1/2] arm-linux-user: fix elfload.c's AT_HWCAP to reflect cpu features.
In reply to Benoît Canet2011/11/9 Benoît Canet <[email protected]>:
Quoted 8 lines
The cpu capabilities passed by the elf loader in
AT_HWCAPwere a constant.
MakeAT_HWCAPreflect the emulated cpu features in order to give correct clues to eglibc.Fix : [Bug 887516] [NEW] VFP support reported for the PXA270
Signed-off-by Benoit Canet <[email protected]>
As this is a linux-user patch it should go via Riku (cc'ing).
-- PMM