michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: Move per-cpu _kernel_t fields into separate struct

Browse source 
When in SMP mode, the nested/irq_stack/current fields are specific to
the current CPU and not to the kernel as a whole, so we need an array
of these.  Place them in a _cpu_t struct and implement a
_arch_curr_cpu() function to retrieve the pointer.

When not in SMP mode, the first CPU's fields are defined as a unioned
with the first _cpu_t record.  This permits compatibility with legacy
assembly on other platforms.  Long term, all users, including
uniprocessor architectures, should be updated to use the new scheme.

Fundamentally this is just renaming: the structure layout and runtime
code do not change on any existing platforms and won't until someone
defines a second CPU.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2018-01-25 16:39:35 -08:00 • committed by Anas Nashif
commit e694656345
7 changed files with 70 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
kernel/include/kernel_structs.h
View file

@ -79,8 +79,7 @@ struct _ready_q {
typedef struct _ready_q _ready_q_t;
struct _kernel {
struct _cpu {
/* nested interrupt count */
u32_t nested;
@ -89,6 +88,30 @@ struct _kernel {
/* currently scheduled thread */
struct k_thread *current;
};
typedef struct _cpu _cpu_t;
struct _kernel {
/* For compatibility with pre-SMP code, union the first CPU
* record with the legacy fields so code can continue to use
* the "_kernel.XXX" expressions and assembly offsets.
*/
union {
struct _cpu cpus[CONFIG_MP_NUM_CPUS];
#ifndef CONFIG_SMP
struct {
/* nested interrupt count */
u32_t nested;
/* interrupt stack pointer base */
char *irq_stack;
/* currently scheduled thread */
struct k_thread *current;
};
#endif
};
#ifdef CONFIG_SYS_CLOCK_EXISTS
/* queue of timeouts */
@ -131,7 +154,12 @@ typedef struct _kernel _kernel_t;
extern struct _kernel _kernel;
#ifdef CONFIG_SMP
#define _current (_arch_curr_cpu()->current)
#else
#define _current _kernel.current
#endif
#define _ready_q _kernel.ready_q
#define _timeout_q _kernel.timeout_q
#define _threads _kernel.threads