[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: b4a20881b8ed7ba36c5bd24d06c3475ea3387d54
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=b4a20881b8ed7ba36c5bd24d06c3475ea3387d54
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: bd02767bd512231f639698cf7ba2c3b4f2f5821f
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=bd02767bd512231f639698cf7ba2c3b4f2f5821f
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: bfda6bf6febb298d6f4bf5eee3591afdc2d1c900
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=bfda6bf6febb298d6f4bf5eee3591afdc2d1c900
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 94b34b47b8471fc25143f9b8e7590b09d3c04b80
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=94b34b47b8471fc25143f9b8e7590b09d3c04b80
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 3ecf0f0ec38ffacdf662cb77ead7b4b03377e3b8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=3ecf0f0ec38ffacdf662cb77ead7b4b03377e3b8
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: e96e9d92e7a2ece6e5b7d5a1346dbd1ee4cf0055
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=e96e9d92e7a2ece6e5b7d5a1346dbd1ee4cf0055
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 69430ae3dbb735e5bdff96de95d39214f99c9773
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=69430ae3dbb735e5bdff96de95d39214f99c9773
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: bccf7e1dc351dc421e2e215d11f85e0ded085379
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=bccf7e1dc351dc421e2e215d11f85e0ded085379
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 6b596ef3946af70704399c3252b46081985d566c
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=6b596ef3946af70704399c3252b46081985d566c
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 23e42e128e96f3c99b8bd2be2c4e51ac98685457
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=23e42e128e96f3c99b8bd2be2c4e51ac98685457
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 4995dfc93138b14f6755be0df5ff14360de67842
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=4995dfc93138b14f6755be0df5ff14360de67842
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: aee63f4d23784fa6cc95732d38988df7f9c01e64
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=aee63f4d23784fa6cc95732d38988df7f9c01e64
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 570df423902f253cf8d84c64f3446b843e66eab8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=570df423902f253cf8d84c64f3446b843e66eab8
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: e5a5b3d1fadc8f32d8ca8136c6c402f3ef4ffa92
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=e5a5b3d1fadc8f32d8ca8136c6c402f3ef4ffa92
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: de14d34b10d563411b93f34dc158e648dd4e97ff
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=de14d34b10d563411b93f34dc158e648dd4e97ff
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 747e3f98f619854e2cdd735b8b752c0c08ef7c44
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=747e3f98f619854e2cdd735b8b752c0c08ef7c44
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: aedc0c5325b73acfa2800ca62a0b6eafa3869d38
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=aedc0c5325b73acfa2800ca62a0b6eafa3869d38
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: 2827b867a6feb9260b31649ec7a6941789b433bd
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=2827b867a6feb9260b31649ec7a6941789b433bd
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: next
Commit: e3a9fd465804eeb2ff73f5f171036890c606b2de
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=e3a9fd465804eeb2ff73f5f171036890c606b2de
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatile
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: arm64
Commit: 02e4fab4215698e28157c0d4145e524acf1b60d8
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=02e4fab4215698e28157c0d4145e524acf1b60d8
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatil
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: arm64
Commit: fa64885a4f640688c24ed80bacd70976cc33f132
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=fa64885a4f640688c24ed80bacd70976cc33f132
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatil
[Xenomai-git] Dmitriy Cherkasov : cobalt/arm64: add basic FPU support
Module: xenomai-3
Branch: arm64
Commit: 8e4278c23c6ab7a269864d697d4d62e97936d72b
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=8e4278c23c6ab7a269864d697d4d62e97936d72b
Author: Dmitriy Cherkasov
Date: Fri Sep 11 17:58:54 2015 -0700
cobalt/arm64: add basic FPU support
---
kernel/cobalt/arch/arm64/Kconfig |2 +-
.../cobalt/arch/arm64/include/asm/xenomai/fptest.h | 11 +-
.../cobalt/arch/arm64/include/asm/xenomai/thread.h | 17 +-
.../arch/arm64/include/asm/xenomai/uapi/fptest.h | 83 +++--
kernel/cobalt/arch/arm64/thread.c | 329 +---
lib/cobalt/arch/arm64/features.c |4 +-
6 files changed, 153 insertions(+), 293 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/Kconfig b/kernel/cobalt/arch/arm64/Kconfig
index dd5a8c6..27b5026 100644
--- a/kernel/cobalt/arch/arm64/Kconfig
+++ b/kernel/cobalt/arch/arm64/Kconfig
@@ -8,7 +8,7 @@ config XENO_ARCH_WANT_TIP
def_bool y
config XENO_ARCH_FPU
- def_bool VFP
+ def_bool y
config XENO_ARCH_SYS3264
def_bool n
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
index a76f1e6..743d758 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/fptest.h
@@ -20,15 +20,10 @@
#define _COBALT_ARM_ASM_FPTEST_H
#include
+#include
#include
-#ifdef CONFIG_VFP
-#define have_vfp (elf_hwcap & HWCAP_VFP)
-#else /* !CONFIG_VFP */
-#define have_vfp 0
-#endif /* !CONFIG_VFP */
-
-#include
+#define have_fp (elf_hwcap & HWCAP_FP)
static inline int fp_kernel_supported(void)
{
@@ -46,7 +41,7 @@ static inline void fp_linux_end(void)
static inline int fp_detect(void)
{
- return have_vfp ? __COBALT_HAVE_VFP : 0;
+ return have_fp ? __COBALT_HAVE_FPU : 0;
}
#endif /* _COBALT_ARM_ASM_FPTEST_H */
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index a8d7ed4..bfcceb4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -21,21 +21,12 @@
#include
-#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
-#include
-#endif /* CONFIG_VFP */
-#endif /* !CONFIG_XENO_ARCH_FPU */
struct xnarchtcb {
struct xntcb core;
#ifdef CONFIG_XENO_ARCH_FPU
-#ifdef CONFIG_VFP
- union vfp_state *fpup;
+ struct fpsimd_state *fpup;
#define xnarch_fpu_ptr(tcb) ((tcb)->fpup)
-#else
-#define xnarch_fpu_ptr(tcb) NULL
-#endif
#endif
struct {
unsigned long pc;
@@ -67,7 +58,7 @@ static inline void xnarch_enter_root(struct xnthread *root) {
}
int xnarch_escalate(void);
-#if defined(CONFIG_XENO_ARCH_FPU) && defined(CONFIG_VFP)
+#if defined(CONFIG_XENO_ARCH_FPU)
static inline void xnarch_init_root_tcb(struct xnthread *thread)
{
@@ -88,7 +79,7 @@ void xnarch_switch_fpu(struct xnthread *from, struct xnthread
*thread);
int xnarch_handle_fpu_fault(struct xnthread *from,
struct xnthread *to, struct ipipe_trap_data *d);
-#else /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#else /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_init_root_tcb(struct xnthread *thread) { }
static inline void xnarch_init_shadow_tcb(struct xnthread *thread) { }
@@ -114,7 +105,7 @@ static inline int xnarch_handle_fpu_fault(struct xnthread
*from,
{
return 0;
}
-#endif /* !CONFIG_XENO_ARCH_FPU || !CONFIG_VFP */
+#endif /* !CONFIG_XENO_ARCH_FPU */
static inline void xnarch_enable_kfpu(void) { }
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
index 65a3e31..25bc976 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/uapi/fptest.h
@@ -18,53 +18,86 @@
#ifndef _COBALT_ARM_ASM_UAPI_FPTEST_H
#define _COBALT_ARM_ASM_UAPI_FPTEST_H
-#ifdef __aarch64__
-/* CP10 and CP11, used for the FP/NEON operations, are already excluded from
-the list of valid operands for the generic coprocessor instructions */
-#define __COBALT_HAVE_VFP 0
-#else
-#define __COBALT_HAVE_VFP 0x1
-#endif
+#define __COBALT_HAVE_FPU 0x1
static inline void fp_regs_set(int features, unsigned int val)
{
-#if __COBALT_HAVE_VFP != 0
- unsigned long long e[16];
+
+ unsigned long long e[32];
unsigned int i;
- if (features & __COBALT_HAVE_VFP) {
- for (i = 0; i < 16; i++)
+ if (features & __COBALT_HAVE_FPU) {
+
+ for (i = 0; i < 32; i++)
e[i] = val;
- /* vldm %0!, {d0-d15},
- AKA fldmiax %0!, {d0-d15} */
- __asm__ __volatile__("ldc p11, cr0, [%0],#32*4":
-"=r"(i): "0"(&e[0]): "memory");
+ __asm__ __volatil
