Browse Source

[ARM] 5388/1: Add hwcap bits for VFPv3 and VFPv3D16

The VFPv3D16 is a VFPv3 CPU configuration where only 16 double registers
are present, as the VFPv2 configuration. This patch adds the
corresponding hwcap bits so that applications or debuggers have more
information about the supported features.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Catalin Marinas 16 years ago
parent
commit
7279dc3e91
3 changed files with 16 additions and 0 deletions
  1. 2 0
      arch/arm/include/asm/hwcap.h
  2. 2 0
      arch/arm/kernel/setup.c
  3. 12 0
      arch/arm/vfp/vfpmodule.c

+ 2 - 0
arch/arm/include/asm/hwcap.h

@@ -17,6 +17,8 @@
 #define HWCAP_CRUNCH	1024
 #define HWCAP_CRUNCH	1024
 #define HWCAP_THUMBEE	2048
 #define HWCAP_THUMBEE	2048
 #define HWCAP_NEON	4096
 #define HWCAP_NEON	4096
+#define HWCAP_VFPv3	8192
+#define HWCAP_VFPv3D16	16384
 
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 /*
 /*

+ 2 - 0
arch/arm/kernel/setup.c

@@ -779,6 +779,8 @@ static const char *hwcap_str[] = {
 	"crunch",
 	"crunch",
 	"thumbee",
 	"thumbee",
 	"neon",
 	"neon",
+	"vfpv3",
+	"vfpv3d16",
 	NULL
 	NULL
 };
 };
 
 

+ 12 - 0
arch/arm/vfp/vfpmodule.c

@@ -476,6 +476,18 @@ static int __init vfp_init(void)
 		 * in place; report VFP support to userspace.
 		 * in place; report VFP support to userspace.
 		 */
 		 */
 		elf_hwcap |= HWCAP_VFP;
 		elf_hwcap |= HWCAP_VFP;
+#ifdef CONFIG_VFPv3
+		if (VFP_arch >= 3) {
+			elf_hwcap |= HWCAP_VFPv3;
+
+			/*
+			 * Check for VFPv3 D16. CPUs in this configuration
+			 * only have 16 x 64bit registers.
+			 */
+			if (((fmrx(MVFR0) & MVFR0_A_SIMD_MASK)) == 1)
+				elf_hwcap |= HWCAP_VFPv3D16;
+		}
+#endif
 #ifdef CONFIG_NEON
 #ifdef CONFIG_NEON
 		/*
 		/*
 		 * Check for the presence of the Advanced SIMD
 		 * Check for the presence of the Advanced SIMD