[Xenomai-git] Gilles Chanteperdrix : arm: clean-up context switch
Module: xenomai-2.5
Branch: master
Commit: 3893f285f2dc4a8e877d23920788793a2fa317e4
URL:
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=3893f285f2dc4a8e877d23920788793a2fa317e4
Author: Gilles Chanteperdrix
Date: Sat Apr 16 12:31:22 2011 +0200
arm: clean-up context switch
In order to get Linux version 2.6.37 and later working. At this chance,
try and cleanup a bit the code, and do not clear the exclusive monitor
for kernels later than v2.6.32, as starting with commit 200b812d00, it
is done when switching from kernel context to user context.
---
ksrc/arch/arm/switch.S | 125 +---
1 files changed, 55 insertions(+), 70 deletions(-)
diff --git a/ksrc/arch/arm/switch.S b/ksrc/arch/arm/switch.S
index a1e05d1..f48eb05 100644
--- a/ksrc/arch/arm/switch.S
+++ b/ksrc/arch/arm/switch.S
@@ -24,27 +24,46 @@
#ifdef CONFIG_VFP
#include
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+#include
+#else
+ .macro set_tls tp, tmp1, tmp2
+#if defined(CONFIG_HAS_TLS_REG)
+ mcr p15, 0, \tp, c13, c0, 3 @ set TLS register
+#elif !defined(CONFIG_TLS_REG_EMUL)
+ mov \tmp1, #0x0fff
+ str \tp, [\tmp1, #-15] @ TLS val at 0x0ff0
+#endif
+ .endm
+#endif
-/*
- * Switch context routine.
- *
- * Registers according to the ARM procedure call standard:
- * RegDescription
- * r0-r3 argument/scratch registers
- * r4-r9 variable register
- * r10=sl stack limit/variable register
- * r11=fp frame pointer/variable register
- * r12=ip intra-procedure-call scratch register
- * r13=sp stack pointer (auto preserved)
- * r14=lr link register
- * r15=pc program counter (auto preserved)
- *
- * rthal_thread_switch(struct thread_info *out, struct thread_info *in)
- */
+ .macro fpu_switch tmp
+#ifdef CONFIG_VFP
+ @ Always disable VFP so we can lazily save/restore the old
+ @ state. This occurs in the context of the previous thread.
+ VFPFMRX \tmp, FPEXC
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ bic \tmp, \tmp, #FPEXC_ENABLE
+#else
+ bic \tmp, \tmp, #FPEXC_EN
+#endif
+ VFPFMXR FPEXC, \tmp
+#endif
+ .endm
-.text
+ .macro clear_exclusive_monitor
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) && __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_MPCORE
+ clrex
+#else
+ strex r5, r4, [ip]@ Clear exclusive monitor
+#endif
+#endif
+ .endm
-#ifdef CONFIG_VFP
+ .text
+
+#if defined(CONFIG_VFP) && defined(CONFIG_XENO_HW_FPU)
/* Copied from vfp_save_state in arch/arm/vfp/vfphw.S
* r0 = pointer to union vfp_state, r1 = fpexc
*/
@@ -80,16 +99,26 @@ ENTRY(rthal_vfp_load)
#endif
/*
+/*
+ * Switch context routine.
+ *
+ * Registers according to the ARM procedure call standard:
+ * RegDescription
+ * r0-r3 argument/scratch registers
+ * r4-r9 variable register
+ * r10=sl stack limit/variable register
+ * r11=fp frame pointer/variable register
+ * r12=ip intra-procedure-call scratch register
+ * r13=sp stack pointer (auto preserved)
+ * r14=lr link register
+ * r15=pc program counter (auto preserved)
+ *
* Copied from __switch_to, arch/arm/kernel/entry-armv.S.
* Right now it is identical, but who knows what the
* future reserves us...
*
* XXX: All the following config options are NOT tested:
- * CONFIG_CPU_MPCORE
- * CONFIG_CPU_XSCALE
* CONFIG_IWMMXT
- * CONFIG_HAS_TLS_REG
- * CONFIG_VFP
*
* Calling args:
* r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_info
@@ -101,58 +130,14 @@ ENTRY(rthal_thread_switch)
#ifdef CONFIG_MMU
ldr r6, [r2, #TI_CPU_DOMAIN]
#endif
-#if __LINUX_ARM_ARCH__ >= 6
-#ifdef CONFIG_CPU_MPCORE
-clrex
-#else
-strex r5, r4, [ip]@ Clear exclusive monitor
-#endif
-#endif
-#if 0
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-mra r4, r5, acc0
-stmia ip, {r4, r5}
-#endif
-#endif
-#if defined(CONFIG_HAS_TLS_REG)
-mcr p15, 0, r3, c13, c0, 3 @ set TLS register
-#elif !defined(CONFIG_TLS_REG_EMUL)
-mov r4, #0x0fff
-str r3, [r4, #-15] @ TLS val at 0x0ff0
-#endif
+
+clear_exclusive_monitor
+set_tls r3, r4, r5
#ifdef CONFIG_MMU
mcr p15, 0, r6, c3, c0, 0 @ Set domain register
#endif
-#ifdef CONFIG_VFP
-@ Always disable VFP so we can lazily save/restore the old
-@ state. This occurs in the context of the previous thread.
-VFPFMRX r4, FPEXC
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
-bic r4, r4, #FPEXC_ENABLE
-#else
-bic r4, r4, #FPEXC_EN
-#endif
-VFPFMXR FPEXC, r4
-#endif
-#if 0
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) && defined(CONFIG_IWMMXT)
-bl iwmmxt_task_switch
-#endif
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-add r4, r2, #40
[Xenomai-git] Gilles Chanteperdrix : arm: clean-up context switch
Module: xenomai-head
Branch: master
Commit: cf683ac01817bb19ae5429df4ca9e0e57d78b5b1
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=cf683ac01817bb19ae5429df4ca9e0e57d78b5b1
Author: Gilles Chanteperdrix
Date: Sat Apr 16 12:31:22 2011 +0200
arm: clean-up context switch
In order to get Linux version 2.6.37 and later working. At this chance,
try and cleanup a bit the code, and do not clear the exclusive monitor
for kernels later than v2.6.32, as starting with commit 200b812d00, it
is done when switching from kernel context to user context.
---
ksrc/arch/arm/switch.S | 125 +---
1 files changed, 55 insertions(+), 70 deletions(-)
diff --git a/ksrc/arch/arm/switch.S b/ksrc/arch/arm/switch.S
index a1e05d1..f48eb05 100644
--- a/ksrc/arch/arm/switch.S
+++ b/ksrc/arch/arm/switch.S
@@ -24,27 +24,46 @@
#ifdef CONFIG_VFP
#include
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+#include
+#else
+ .macro set_tls tp, tmp1, tmp2
+#if defined(CONFIG_HAS_TLS_REG)
+ mcr p15, 0, \tp, c13, c0, 3 @ set TLS register
+#elif !defined(CONFIG_TLS_REG_EMUL)
+ mov \tmp1, #0x0fff
+ str \tp, [\tmp1, #-15] @ TLS val at 0x0ff0
+#endif
+ .endm
+#endif
-/*
- * Switch context routine.
- *
- * Registers according to the ARM procedure call standard:
- * RegDescription
- * r0-r3 argument/scratch registers
- * r4-r9 variable register
- * r10=sl stack limit/variable register
- * r11=fp frame pointer/variable register
- * r12=ip intra-procedure-call scratch register
- * r13=sp stack pointer (auto preserved)
- * r14=lr link register
- * r15=pc program counter (auto preserved)
- *
- * rthal_thread_switch(struct thread_info *out, struct thread_info *in)
- */
+ .macro fpu_switch tmp
+#ifdef CONFIG_VFP
+ @ Always disable VFP so we can lazily save/restore the old
+ @ state. This occurs in the context of the previous thread.
+ VFPFMRX \tmp, FPEXC
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
+ bic \tmp, \tmp, #FPEXC_ENABLE
+#else
+ bic \tmp, \tmp, #FPEXC_EN
+#endif
+ VFPFMXR FPEXC, \tmp
+#endif
+ .endm
-.text
+ .macro clear_exclusive_monitor
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) && __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_MPCORE
+ clrex
+#else
+ strex r5, r4, [ip]@ Clear exclusive monitor
+#endif
+#endif
+ .endm
-#ifdef CONFIG_VFP
+ .text
+
+#if defined(CONFIG_VFP) && defined(CONFIG_XENO_HW_FPU)
/* Copied from vfp_save_state in arch/arm/vfp/vfphw.S
* r0 = pointer to union vfp_state, r1 = fpexc
*/
@@ -80,16 +99,26 @@ ENTRY(rthal_vfp_load)
#endif
/*
+/*
+ * Switch context routine.
+ *
+ * Registers according to the ARM procedure call standard:
+ * RegDescription
+ * r0-r3 argument/scratch registers
+ * r4-r9 variable register
+ * r10=sl stack limit/variable register
+ * r11=fp frame pointer/variable register
+ * r12=ip intra-procedure-call scratch register
+ * r13=sp stack pointer (auto preserved)
+ * r14=lr link register
+ * r15=pc program counter (auto preserved)
+ *
* Copied from __switch_to, arch/arm/kernel/entry-armv.S.
* Right now it is identical, but who knows what the
* future reserves us...
*
* XXX: All the following config options are NOT tested:
- * CONFIG_CPU_MPCORE
- * CONFIG_CPU_XSCALE
* CONFIG_IWMMXT
- * CONFIG_HAS_TLS_REG
- * CONFIG_VFP
*
* Calling args:
* r0 = previous task_struct, r1 = previous thread_info, r2 = next thread_info
@@ -101,58 +130,14 @@ ENTRY(rthal_thread_switch)
#ifdef CONFIG_MMU
ldr r6, [r2, #TI_CPU_DOMAIN]
#endif
-#if __LINUX_ARM_ARCH__ >= 6
-#ifdef CONFIG_CPU_MPCORE
-clrex
-#else
-strex r5, r4, [ip]@ Clear exclusive monitor
-#endif
-#endif
-#if 0
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-mra r4, r5, acc0
-stmia ip, {r4, r5}
-#endif
-#endif
-#if defined(CONFIG_HAS_TLS_REG)
-mcr p15, 0, r3, c13, c0, 3 @ set TLS register
-#elif !defined(CONFIG_TLS_REG_EMUL)
-mov r4, #0x0fff
-str r3, [r4, #-15] @ TLS val at 0x0ff0
-#endif
+
+clear_exclusive_monitor
+set_tls r3, r4, r5
#ifdef CONFIG_MMU
mcr p15, 0, r6, c3, c0, 0 @ Set domain register
#endif
-#ifdef CONFIG_VFP
-@ Always disable VFP so we can lazily save/restore the old
-@ state. This occurs in the context of the previous thread.
-VFPFMRX r4, FPEXC
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
-bic r4, r4, #FPEXC_ENABLE
-#else
-bic r4, r4, #FPEXC_EN
-#endif
-VFPFMXR FPEXC, r4
-#endif
-#if 0
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) && defined(CONFIG_IWMMXT)
-bl iwmmxt_task_switch
-#endif
-#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
-add r4, r2, #40
