michaelh/zephyr
1
0
Fork 0
Code Releases Activity
zephyr/arch/nios2/core/swap.S

195 lines
5.2 KiB
ArmAsm
Raw Normal View History

nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/*
* Copyright (c) 2016 Intel Corporation
*
license: Replace Apache boilerplate with SPDX tag Replace the existing Apache 2.0 boilerplate header with an SPDX tag throughout the zephyr code tree. This patch was generated via a script run over the master branch. Also updated doc/porting/application.rst that had a dependency on line numbers in a literal include. Manually updated subsys/logging/sys_log.c that had a malformed header in the original file. Also cleanup several cases that already had a SPDX tag and we either got a duplicate or missed updating. Jira: ZEP-1457 Change-Id: I6131a1d4ee0e58f5b938300c2d2fc77d2e69572c Signed-off-by: David B. Kinder <david.b.kinder@intel.com> Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
2017-01-18 17:01:01 -08:00
* SPDX-License-Identifier: Apache-2.0
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
#include <kernel_structs.h>
#include <offsets_short.h>
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/* exports */
kernel: tickless: Rename _Swap to allow creation of macro Future tickless kernel patches would be inserting some code before call to Swap. To enable this it will create a mcro named as the current _Swap which would call first the tickless kernel code and then call the real __swap() Jira: ZEP-339 Change-Id: Id778bfcee4f88982c958fcf22d7f04deb4bd572f Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
2017-04-06 15:30:27 -07:00
GTEXT(__swap)
arch: Rename reserved function names Rename reserved function names in arch/ subdirectory. The Python script gen_priv_stacks.py was updated to follow the 'z_' prefix naming. Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-14 09:20:46 -06:00
GTEXT(z_thread_entry_wrapper)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
nios2: implement kernel_event_logger Interrupts and context switches are logged. Since this CPU does not have a power-saving instruction, it never enters a sleep state so we do not call _sys_k_event_logger_enter_sleep() from anywhere. Change-Id: Idcef388e93ffea373446997a0f87e93a4db44331 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-29 16:29:15 -07:00
/* imports */
debug: tracing: Remove unneeded abstraction Various C and Assembly modules make function calls to z_sys_trace_*. These merely call corresponding functions sys_trace_*. This commit is to simplify these by making direct function calls to the sys_trace_* functions from these modules. Subsequently, the z_sys_trace_* functions are removed. Signed-off-by: Mrinal Sen <msen@oticon.com>
2019-09-19 09:25:19 +02:00
GTEXT(sys_trace_thread_switched_in)
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
GTEXT(_k_neg_eagain)
nios2: implement kernel_event_logger Interrupts and context switches are logged. Since this CPU does not have a power-saving instruction, it never enters a sleep state so we do not call _sys_k_event_logger_enter_sleep() from anywhere. Change-Id: Idcef388e93ffea373446997a0f87e93a4db44331 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-29 16:29:15 -07:00
kernel: tickless: Rename _Swap to allow creation of macro Future tickless kernel patches would be inserting some code before call to Swap. To enable this it will create a mcro named as the current _Swap which would call first the tickless kernel code and then call the real __swap() Jira: ZEP-339 Change-Id: Id778bfcee4f88982c958fcf22d7f04deb4bd572f Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
2017-04-06 15:30:27 -07:00
/* unsigned int __swap(unsigned int key)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
*
* Always called with interrupts locked
*/
kernel: tickless: Rename _Swap to allow creation of macro Future tickless kernel patches would be inserting some code before call to Swap. To enable this it will create a mcro named as the current _Swap which would call first the tickless kernel code and then call the real __swap() Jira: ZEP-339 Change-Id: Id778bfcee4f88982c958fcf22d7f04deb4bd572f Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
2017-04-06 15:30:27 -07:00
SECTION_FUNC(exception.other, __swap)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
tests: benchmarks: timing_info: Enable benchmarks for nios2. This patch provides support needed to get timing related information from nios2 based SOC. Signed-off-by: Adithya Baglody <adithya.nagaraj.baglody@intel.com>
2018-07-23 13:57:06 +05:30
#ifdef CONFIG_EXECUTION_BENCHMARKING
/* Get a reference to _kernel in r10 */
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
/* Get the pointer to kernel->current */
ldw r11, _kernel_offset_to_current(r10)
stw r2, _thread_offset_to_r16(r11)
stw r3, _thread_offset_to_r17(r11)
stw r4, _thread_offset_to_r18(r11)
stw ra, _thread_offset_to_ra(r11)
stw sp, _thread_offset_to_sp(r11)
call read_timer_start_of_swap
/* Get a reference to _kernel in r10 */
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
/* Get the pointer to kernel->current */
ldw r11, _kernel_offset_to_current(r10)
ldw r2, _thread_offset_to_r16(r11)
ldw r3, _thread_offset_to_r17(r11)
ldw r4, _thread_offset_to_r18(r11)
ldw ra, _thread_offset_to_ra(r11)
ldw sp, _thread_offset_to_sp(r11)
#endif
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
/* Get a reference to _kernel in r10 */
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
kernel: replace all remaining nanokernel occurances replace include <nanokernel.h> with <kernel.h> everywhere and also fix any remaining mentions of nanokernel. Keep the legacy samples/tests as is. Change-Id: Iac48447bd191e83f21a719c69dc26233216d08dc Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2016-12-23 08:35:34 -05:00
/* Get the pointer to kernel->current */
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
ldw r11, _kernel_offset_to_current(r10)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/* Store all the callee saved registers. We either got here via
kernel: tickless: Rename _Swap to allow creation of macro Future tickless kernel patches would be inserting some code before call to Swap. To enable this it will create a mcro named as the current _Swap which would call first the tickless kernel code and then call the real __swap() Jira: ZEP-339 Change-Id: Id778bfcee4f88982c958fcf22d7f04deb4bd572f Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
2017-04-06 15:30:27 -07:00
* an exception or from a cooperative invocation of __swap() from C
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
* domain, so all the caller-saved registers have already been
* saved by the exception asm or the calling C code already.
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
stw r16, _thread_offset_to_r16(r11)
stw r17, _thread_offset_to_r17(r11)
stw r18, _thread_offset_to_r18(r11)
stw r19, _thread_offset_to_r19(r11)
stw r20, _thread_offset_to_r20(r11)
stw r21, _thread_offset_to_r21(r11)
stw r22, _thread_offset_to_r22(r11)
stw r23, _thread_offset_to_r23(r11)
stw r28, _thread_offset_to_r28(r11)
stw ra, _thread_offset_to_ra(r11)
stw sp, _thread_offset_to_sp(r11)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/* r4 has the 'key' argument which is the result of irq_lock()
* before this was called
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
stw r4, _thread_offset_to_key(r11)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
/* Populate default return value */
movhi r5, %hi(_k_neg_eagain)
ori r5, r5, %lo(_k_neg_eagain)
ldw r4, (r5)
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
stw r4, _thread_offset_to_retval(r11)
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
kernel: event_logger: remove kernel_event_logger Move to more generic tracing hooks that can be implemented in different ways and do not interfere with the kernel. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2018-04-06 07:48:53 -04:00
#if CONFIG_TRACING
debug: tracing: Remove unneeded abstraction Various C and Assembly modules make function calls to z_sys_trace_*. These merely call corresponding functions sys_trace_*. This commit is to simplify these by making direct function calls to the sys_trace_* functions from these modules. Subsequently, the z_sys_trace_* functions are removed. Signed-off-by: Mrinal Sen <msen@oticon.com>
2019-09-19 09:25:19 +02:00
call sys_trace_thread_switched_in
debug: add stack sentinel feature This places a sentinel value at the lowest 4 bytes of a stack memory region and checks it at various intervals, including when servicing interrupts or context switching. This is implemented on all arches except ARC, which supports stack bounds checking directly in hardware. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-05-11 13:29:15 -07:00
/* restore caller-saved r10 */
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
debug: add stack sentinel feature This places a sentinel value at the lowest 4 bytes of a stack memory region and checks it at various intervals, including when servicing interrupts or context switching. This is implemented on all arches except ARC, which supports stack bounds checking directly in hardware. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2017-05-11 13:29:15 -07:00
#endif
kernel/arch: enhance the "ready thread" cache The way the ready thread cache was implemented caused it to not always be "hot", i.e. there could be some misses, which happened when the cached thread was taken out of the ready queue. When that happened, it was not replaced immediately, since doing so could mean that the replacement might not run because the flow could be interrupted and another thread could take its place. This was the more conservative approach that insured that moving a thread to the cache would never be wasted. However, this caused two problems: 1. The cache could not be refilled until another thread context-switched in, since there was no thread in the cache to compare priorities against. 2. Interrupt exit code would always have to call into C to find what thread to run when the current thread was not coop and did not have the scheduler locked. Furthermore, it was possible for this code path to encounter a cold cache and then it had to find out what thread to run the long way. To fix this, filling the cache is now more aggressive, i.e. the next thread to put in the cache is found even in the case the current cached thread is context-switched out. This ensures the interrupt exit code is much faster on the slow path. In addition, since finding the next thread to run is now always "get it from the cache", which is a simple fetch from memory (_kernel.ready_q.cache), there is no need to call the more complex C code. On the ARM FRDM K64F board, this improvement is seen: Before: 1- Measure time to switch from ISR back to interrupted task switching time is 215 tcs = 1791 nsec 2- Measure time from ISR to executing a different task (rescheduled) switch time is 315 tcs = 2625 nsec After: 1- Measure time to switch from ISR back to interrupted task switching time is 130 tcs = 1083 nsec 2- Measure time from ISR to executing a different task (rescheduled) switch time is 225 tcs = 1875 nsec These are the most dramatic improvements, but most of the numbers generated by the latency_measure test are improved. Fixes ZEP-1401. Change-Id: I2eaac147048b1ec71a93bd0a285e743a39533973 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-12-02 10:37:27 -05:00
/* get cached thread to run */
ldw r2, _kernel_offset_to_ready_q_cache(r10)
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
/* At this point r2 points to the next thread to be swapped in */
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
kernel/arch: enhance the "ready thread" cache The way the ready thread cache was implemented caused it to not always be "hot", i.e. there could be some misses, which happened when the cached thread was taken out of the ready queue. When that happened, it was not replaced immediately, since doing so could mean that the replacement might not run because the flow could be interrupted and another thread could take its place. This was the more conservative approach that insured that moving a thread to the cache would never be wasted. However, this caused two problems: 1. The cache could not be refilled until another thread context-switched in, since there was no thread in the cache to compare priorities against. 2. Interrupt exit code would always have to call into C to find what thread to run when the current thread was not coop and did not have the scheduler locked. Furthermore, it was possible for this code path to encounter a cold cache and then it had to find out what thread to run the long way. To fix this, filling the cache is now more aggressive, i.e. the next thread to put in the cache is found even in the case the current cached thread is context-switched out. This ensures the interrupt exit code is much faster on the slow path. In addition, since finding the next thread to run is now always "get it from the cache", which is a simple fetch from memory (_kernel.ready_q.cache), there is no need to call the more complex C code. On the ARM FRDM K64F board, this improvement is seen: Before: 1- Measure time to switch from ISR back to interrupted task switching time is 215 tcs = 1791 nsec 2- Measure time from ISR to executing a different task (rescheduled) switch time is 315 tcs = 2625 nsec After: 1- Measure time to switch from ISR back to interrupted task switching time is 130 tcs = 1083 nsec 2- Measure time from ISR to executing a different task (rescheduled) switch time is 225 tcs = 1875 nsec These are the most dramatic improvements, but most of the numbers generated by the latency_measure test are improved. Fixes ZEP-1401. Change-Id: I2eaac147048b1ec71a93bd0a285e743a39533973 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-12-02 10:37:27 -05:00
/* the thread to be swapped in is now the current thread */
stw r2, _kernel_offset_to_current(r10)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/* Restore callee-saved registers and switch to the incoming
* thread's stack
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
ldw r16, _thread_offset_to_r16(r2)
ldw r17, _thread_offset_to_r17(r2)
ldw r18, _thread_offset_to_r18(r2)
ldw r19, _thread_offset_to_r19(r2)
ldw r20, _thread_offset_to_r20(r2)
ldw r21, _thread_offset_to_r21(r2)
ldw r22, _thread_offset_to_r22(r2)
ldw r23, _thread_offset_to_r23(r2)
ldw r28, _thread_offset_to_r28(r2)
ldw ra, _thread_offset_to_ra(r2)
ldw sp, _thread_offset_to_sp(r2)
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
/* We need to irq_unlock(current->coopReg.key);
kernel: tickless: Rename _Swap to allow creation of macro Future tickless kernel patches would be inserting some code before call to Swap. To enable this it will create a mcro named as the current _Swap which would call first the tickless kernel code and then call the real __swap() Jira: ZEP-339 Change-Id: Id778bfcee4f88982c958fcf22d7f04deb4bd572f Signed-off-by: Ramesh Thomas <ramesh.thomas@intel.com>
2017-04-06 15:30:27 -07:00
* key was supplied as argument to __swap(). Fetch it.
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
ldw r3, _thread_offset_to_key(r2)
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
arch: remove instances of fiberRtnValueSet() Obsolete, replaced by _set_thread_return_value(). Change-Id: I23e9cfc07e43542f0965817edc3552d456fd2ef3 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-12-21 11:16:01 -05:00
/*
* Load return value into r2 (return value register). -EAGAIN unless
kernel: rename thread return value functions z_set_thread_return_value is part of the core kernel -> arch interface and has been renamed to z_arch_thread_return_value_set. z_set_thread_return_value_with_data renamed to z_thread_return_value_set_with_data for consistency. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-09-21 16:25:56 -07:00
* someone previously called z_arch_thread_return_value_set(). Do this before
arch: remove instances of fiberRtnValueSet() Obsolete, replaced by _set_thread_return_value(). Change-Id: I23e9cfc07e43542f0965817edc3552d456fd2ef3 Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-12-21 11:16:01 -05:00
* we potentially unlock interrupts.
nios2: implement fiberRtnValueSet() The return value of _Swap() is often treated as a "don't care" value and thus often ignored. However, there are cases when it is desirable to have a meaningful return value. This meaningful value can be assigned via fiberRtnValueSet(). To that end, a new field has been added to the coop register struct to store this value for when _Swap() needs to return that meaningful value. Change-Id: Ic4967fa7d602850c09ebde18e8bfd4c97cda9ec8 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-23 20:10:01 -07:00
*/
kernel/arch: consolidate tTCS and TNANO definitions There was a lot of duplication between architectures for the definition of threads and the "nanokernel" guts. These have been consolidated. Now, a common file kernel/unified/include/kernel_structs.h holds the common definitions. Architectures provide two files to complement it: kernel_arch_data.h and kernel_arch_func.h. The first one contains at least the struct _thread_arch and struct _kernel_arch data structures, as well as the struct _callee_saved and struct _caller_saved register layouts. The second file contains anything that needs what is provided by the common stuff in kernel_structs.h. Those two files are only meant to be included in kernel_structs.h in very specific locations. The thread data structure has been separated into three major parts: common struct _thread_base and struct k_thread, and arch-specific struct _thread_arch. The first and third ones are included in the second. The struct s_NANO data structure has been split into two: common struct _kernel and arch-specific struct _kernel_arch. The latter is included in the former. Offsets files have also changed: nano_offsets.h has been renamed kernel_offsets.h and is still included by the arch-specific offsets.c. Also, since the thread and kernel data structures are now made of sub-structures, offsets have to be added to make up the full offset. Some of these additions have been consolidated in shorter symbols, available from kernel/unified/include/offsets_short.h, which includes an arch-specific offsets_arch_short.h. Most of the code include offsets_short.h now instead of offsets.h. Change-Id: I084645cb7e6db8db69aeaaf162963fe157045d5a Signed-off-by: Benjamin Walsh <benjamin.walsh@windriver.com>
2016-11-08 10:36:50 -05:00
ldw r2, _thread_offset_to_retval(r2)
nios2: implement fiberRtnValueSet() The return value of _Swap() is often treated as a "don't care" value and thus often ignored. However, there are cases when it is desirable to have a meaningful return value. This meaningful value can be assigned via fiberRtnValueSet(). To that end, a new field has been added to the coop register struct to store this value for when _Swap() needs to return that meaningful value. Change-Id: Ic4967fa7d602850c09ebde18e8bfd4c97cda9ec8 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-23 20:10:01 -07:00
nios2: port to unified kernel With this patch we introduce unified kernel support for NIOS II. Not all test cases have been ported, but the following command currently succeeds with 43/43 passing test cases: $ sanitycheck --arch=nios2 -xKERNEL_TYPE=unified \ --tag=unified_capable Issue: ZEP-934 Change-Id: Id8effa0369a6a22c4d0a789fa2a8e108af0e0786 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-10-25 11:47:52 -07:00
/* Now do irq_unlock(current->coopReg.key) */
nios2: get CPU features from ALT_CPU_* namespace NIOS2_* namespace is deprecated. Change-Id: I5a9b07ee33b20aa18509e9d789837f48199ab25d Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-07-11 12:42:02 -07:00
#if (ALT_CPU_NUM_OF_SHADOW_REG_SETS > 0) || \
(defined ALT_CPU_EIC_PRESENT) || \
(defined ALT_CPU_MMU_PRESENT) || \
(defined ALT_CPU_MPU_PRESENT)
nios2: implement fiberRtnValueSet() The return value of _Swap() is often treated as a "don't care" value and thus often ignored. However, there are cases when it is desirable to have a meaningful return value. This meaningful value can be assigned via fiberRtnValueSet(). To that end, a new field has been added to the coop register struct to store this value for when _Swap() needs to return that meaningful value. Change-Id: Ic4967fa7d602850c09ebde18e8bfd4c97cda9ec8 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-23 20:10:01 -07:00
andi r3, r3, NIOS2_STATUS_PIE_MSK
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
beq r3, zero, no_unlock
rdctl r3, status
ori r3, r3, NIOS2_STATUS_PIE_MSK
wrctl status, r3
toolchain: Remove vestigial COFF assembler symbol mangling support The toolchain headers included an abstraction for defining symbol names in assembly context in the situation where we're using a DOS-style assembler that automatically prepends an underscore to symbol names. We aren't. Zephyr is an ELF platform. None of our toolchains do this. Nothing sets the "TOOL_PREPENDS_UNDERSCORE" macro from within the project, and it surely isn't an industry standard. Yank it out. Now we can write assembler labels in natural syntax, and a few other things fall out to simplify too. (NOTE: these headers contain assembly code and will fail checkpatch. That is an expected false positive.) Change-Id: Ic89e74422b52fe50b3b7306a0347d7a560259581 Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2016-08-18 09:25:00 -07:00
no_unlock:
nios2: _Swap(): optimize irq unlock If the CPU lacks certain features the only writable bit in the status register is the PIE bit, so just write the saved value back. Change-Id: I91537ff640aa9977d19587c4b0ae414028752341 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-24 07:56:48 -07:00
#else
wrctl status, r3
#endif
tests: benchmarks: timing_info: Enable benchmarks for nios2. This patch provides support needed to get timing related information from nios2 based SOC. Signed-off-by: Adithya Baglody <adithya.nagaraj.baglody@intel.com>
2018-07-23 13:57:06 +05:30
#ifdef CONFIG_EXECUTION_BENCHMARKING
/* Get a reference to _kernel in r10 */
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
ldw r11, _kernel_offset_to_current(r10)
stw r2, _thread_offset_to_r16(r11)
stw r3, _thread_offset_to_r17(r11)
stw r4, _thread_offset_to_r18(r11)
stw ra, _thread_offset_to_ra(r11)
stw sp, _thread_offset_to_sp(r11)
call read_timer_end_of_swap
/* Get a reference to _kernel in r10 */
movhi r10, %hi(_kernel)
ori r10, r10, %lo(_kernel)
/* Get the pointer to kernel->current */
ldw r11, _kernel_offset_to_current(r10)
ldw r2, _thread_offset_to_r16(r11)
ldw r3, _thread_offset_to_r17(r11)
ldw r4, _thread_offset_to_r18(r11)
ldw ra, _thread_offset_to_ra(r11)
ldw sp, _thread_offset_to_sp(r11)
#endif
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
ret
arch: Rename reserved function names Rename reserved function names in arch/ subdirectory. The Python script gen_priv_stacks.py was updated to follow the 'z_' prefix naming. Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-14 09:20:46 -06:00
/* void z_thread_entry_wrapper(void)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
*/
arch: Rename reserved function names Rename reserved function names in arch/ subdirectory. The Python script gen_priv_stacks.py was updated to follow the 'z_' prefix naming. Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-14 09:20:46 -06:00
SECTION_FUNC(TEXT, z_thread_entry_wrapper)
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
/* This all corresponds to struct init_stack_frame defined in
* thread.c. We need to take this stuff off the stack and put
docs: fix misspelling across the tree Found a few annoying typos and figured I better run script and fix anything it can find, here are the results... Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-06-18 14:45:40 -04:00
* it in the appropriate registers
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
*/
/* Can't return from here, just put NULL in ra */
movi ra, 0
/* Calling convention has first 4 arguments in registers r4-r7. */
ldw r4, 0(sp)
ldw r5, 4(sp)
ldw r6, 8(sp)
ldw r7, 12(sp)
/* pop all the stuff that we just loaded into registers */
addi sp, sp, 16
all: Update reserved function names Update reserved function names starting with one underscore, replacing them as follows: '_k_' with 'z_' '_K_' with 'Z_' '_handler_' with 'z_handl_' '_Cstart' with 'z_cstart' '_Swap' with 'z_swap' This renaming is done on both global and those static function names in kernel/include and include/. Other static function names in kernel/ are renamed by removing the leading underscore. Other function names not starting with any prefix listed above are renamed starting with a 'z_' or 'Z_' prefix. Function names starting with two or three leading underscores are not automatcally renamed since these names will collide with the variants with two or three leading underscores. Various generator scripts have also been updated as well as perf, linker and usb files. These are drivers/serial/uart_handlers.c include/linker/kobject-text.ld kernel/include/syscall_handler.h scripts/gen_kobject_list.py scripts/gen_syscall_header.py Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
2019-03-08 14:19:05 -07:00
call z_thread_entry
nios2: implement _Swap() and _new_thread() With this code we can successfully boot and context switch into the main thread. Nanokernel hello_world has the expected "Hello World!" string in the RAM console. Change-Id: I56335d992f5a7cbb12d9e4c02d1cc23ea28ae6ef Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2016-06-17 13:09:40 -07:00
Copy permalink