Fixed bug #706.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@8877 35acf78f-673a-0410-8e92-d51de3d6d3f4

doc/nil/Doxyfile_chm

@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/nil/Doxyfile_html

@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/NIL
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/rt/Doxyfile_chm

@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/RT
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.1.2
+PROJECT_NUMBER         = 3.1.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doc/rt/Doxyfile_html

@@ -38,7 +38,7 @@ PROJECT_NAME           = ChibiOS/RT
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.1.2
+PROJECT_NUMBER         = 3.1.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

os/nil/include/nil.h

@@ -61,7 +61,7 @@ typedef struct nil_thread thread_t;
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "1.1.1"
+#define CH_KERNEL_VERSION       "1.1.2"
 
 /**
  * @brief   Kernel version major number.
@@ -76,7 +76,7 @@ typedef struct nil_thread thread_t;
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         1
+#define CH_KERNEL_PATCH         2
 /** @} */
 
 /**

os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v7m.s

@@ -64,8 +64,18 @@ _port_switch:
 #if CORTEX_USE_FPU
                 vpush   {s16-s31}
 #endif
+
                 str     sp, [r1, #CONTEXT_OFFSET]
+#if (CORTEX_SIMPLIFIED_PRIORITY == FALSE) &&                                \
+    ((CORTEX_MODEL == 3) || (CORTEX_MODEL == 4))
+                /* Workaround for ARM errata 752419, only applied if
+                   condition exists for it to be triggered.*/
+                ldr     r3, [r0, #CONTEXT_OFFSET]
+                mov     sp, r3
+#else
                 ldr     sp, [r0, #CONTEXT_OFFSET]
+#endif
+
 #if CORTEX_USE_FPU
                 vpop    {s16-s31}
 #endif

os/rt/include/ch.h

@@ -48,7 +48,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "3.1.2"
+#define CH_KERNEL_VERSION       "3.1.3"
 
 /**
  * @brief   Kernel version major number.
@@ -63,7 +63,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         2
+#define CH_KERNEL_PATCH         3
 /** @} */
 
 /* Core headers.*/

os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.s

@@ -64,8 +64,18 @@ _port_switch:
 #if CORTEX_USE_FPU
                 vpush   {s16-s31}
 #endif
+
                 str     sp, [r1, #CONTEXT_OFFSET]
+#if (CORTEX_SIMPLIFIED_PRIORITY == FALSE) &&                                \
+    ((CORTEX_MODEL == 3) || (CORTEX_MODEL == 4))
+                /* Workaround for ARM errata 752419, only applied if
+                   condition exists for it to be triggered.*/
+                ldr     r3, [r0, #CONTEXT_OFFSET]
+                mov     sp, r3
+#else
                 ldr     sp, [r0, #CONTEXT_OFFSET]
+#endif
+
 #if CORTEX_USE_FPU
                 vpop    {s16-s31}
 #endif

os/rt/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s

@@ -72,8 +72,18 @@ _port_switch:
 #if CORTEX_USE_FPU
                 vpush   {s16-s31}
 #endif
+
                 str     sp, [r1, #CONTEXT_OFFSET]
+#if (CORTEX_SIMPLIFIED_PRIORITY == FALSE) &&                                \
+    ((CORTEX_MODEL == 3) || (CORTEX_MODEL == 4))
+                /* Workaround for ARM errata 752419, only applied if
+                   condition exists for it to be triggered.*/
+                ldr     r3, [r0, #CONTEXT_OFFSET]
+                mov     sp, r3
+#else
                 ldr     sp, [r0, #CONTEXT_OFFSET]
+#endif
+
 #if CORTEX_USE_FPU
                 vpop    {s16-s31}
 #endif

os/rt/ports/ARMCMx/compilers/RVCT/chcoreasm_v7m.s

@@ -67,8 +67,18 @@ _port_switch    PROC
 #if CORTEX_USE_FPU
                 vpush   {s16-s31}
 #endif
-                str     sp, [r1, #CONTEXT_OFFSET]                          
+
+                str     sp, [r1, #CONTEXT_OFFSET]
+#if (CORTEX_SIMPLIFIED_PRIORITY == FALSE) &&                                \
+    ((CORTEX_MODEL == 3) || (CORTEX_MODEL == 4))
+                /* Workaround for ARM errata 752419, only applied if
+                   condition exists for it to be triggered.*/
+                ldr     r3, [r0, #CONTEXT_OFFSET]
+                mov     sp, r3
+#else
                 ldr     sp, [r0, #CONTEXT_OFFSET]
+#endif
+
 #if CORTEX_USE_FPU
                 vpop    {s16-s31}
 #endif

readme.txt

@@ -72,6 +72,10 @@
 *** Releases and Change Log                                               ***
 *****************************************************************************
 
+*** 16.1.4 ***
+- NIL: Fixed ARM errata 752419 (bug #706).
+- RT:  Fixed ARM errata 752419 (bug #706).
+
 *** 16.1.3 ***
 - HAL: Fixed unused variable in STM32 SPIv2 driver (bug #705).
 - HAL: Fixed chDbgAssert() still called from STM32 SPIv1 driver (bug #704).