From ac3fdf0be1187a707436a7231d8d8587b1a6b373 Mon Sep 17 00:00:00 2001 From: Dirk Brandewie Date: Wed, 24 Jun 2015 08:22:56 -0700 Subject: [PATCH] init: Add init system calls to micro and nano kernel init Add the call sites for the various init levels defined by the init system. These call sites are noops if there is no init proceedure registered at a given init level. pre_app_init has been renamed to app_early_init and late_initconfig to app_late_init to better reflect the ordering and intended use of these init levels Change-Id: I71e38d936a97da8fe163f4b7cf0ce6725f1c903e Signed-off-by: Dirk Brandewie --- include/device.h | 2 +- include/init.h | 38 ++++++++++++++++++++++++++++------- kernel/microkernel/k_init.c | 7 +++++++ kernel/nanokernel/device.c | 2 +- kernel/nanokernel/nano_init.c | 33 +++++++++++++++++++++++++++++- 5 files changed, 72 insertions(+), 10 deletions(-) diff --git a/include/device.h b/include/device.h index c40bac38465..e3e5652128f 100644 --- a/include/device.h +++ b/include/device.h @@ -83,7 +83,7 @@ struct device { void *driver_data; }; -void device_do_config_level(int level); +void _sys_device_do_config_level(int level); struct device* device_get_binding(char *name); #endif /* _DEVICE_H_ */ diff --git a/include/init.h b/include/init.h index e52522f33a7..4d5b3bce87b 100644 --- a/include/init.h +++ b/include/init.h @@ -34,6 +34,14 @@ #include #define __used __attribute__((__used__)) +#define PURE 0 +#define NANO_EARLY 1 +#define NANO_LATE 2 +#define MICRO_EARLY 3 +#define MICRO_LATE 4 +#define APP_EARLY 5 +#define APP_LATE 6 + /*! @def __define_initconfig * * @brief Define an init object @@ -58,13 +66,29 @@ .config = &(config_##cfg_name),\ .driver_data = data}; -#define pure_init(cfg, data) __define_initconfig(cfg, 0, data) -#define nano_early_init(cfg, data) __define_initconfig(cfg, 1, data) -#define nano_late_init(cfg, data) __define_initconfig(cfg, 2, data) -#define micro_early_init(cfg, data) __define_initconfig(cfg, 3, data) -#define micro_late_init(cfg, data) __define_initconfig(cfg, 4, data) -#define pre_app_init(cfg, data) __define_initconfig(cfg, 5, data) -#define late_initconfig(cfg, data) __define_initconfig(cfg, 6, data) +/* Run on interrupt stack; no {micro,nano} kernel objects available */ +#define pure_init(cfg, data) __define_initconfig(cfg, \ + PURE, data) + +/* Run from nano kernel idle task; no micro kernel objects available */ +#define nano_early_init(cfg, data) __define_initconfig(cfg, \ + NANO_EARLY, data) +#define nano_late_init(cfg, data) __define_initconfig(cfg, \ + NANO_LATE, data) + +/* Run from micro kernel idle task. */ +#define micro_early_init(cfg, data) __define_initconfig(cfg, \ + MICRO_EARLY, data) +#define micro_late_init(cfg, data) __define_initconfig(cfg, \ + MICRO_LATE, data) + +/* Run in the idle task; In a nano kernel only system run after + * nano_late_init(). In a micro kernel system after micro_late_init() + */ +#define app_early_init(cfg, data) __define_initconfig(cfg, \ + APP_EARLY, data) +#define app_late_init(cfg, data) __define_initconfig(cfg, \ + APP_LATE, data) #endif /* _INIT_H_ */ diff --git a/kernel/microkernel/k_init.c b/kernel/microkernel/k_init.c index 73cfb060ef5..d1eb32640be 100644 --- a/kernel/microkernel/k_init.c +++ b/kernel/microkernel/k_init.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #ifdef CONFIG_BOOT_TIME_MEASUREMENT #include @@ -93,6 +95,11 @@ void _k_kernel_init(void) 0); _k_init_drivers(); + _sys_device_do_config_level(MICRO_EARLY); + _sys_device_do_config_level(MICRO_LATE); + _sys_device_do_config_level(APP_EARLY); + _sys_device_do_config_level(APP_LATE); + #ifdef CONFIG_WORKLOAD_MONITOR _k_workload_monitor_calibrate(); diff --git a/kernel/nanokernel/device.c b/kernel/nanokernel/device.c index a3f1bed7107..0c89ebf083f 100644 --- a/kernel/nanokernel/device.c +++ b/kernel/nanokernel/device.c @@ -35,7 +35,7 @@ static struct device *config_levels[] = { * * @param level init level to run. */ -void device_do_config_level(int level) +void _sys_device_do_config_level(int level) { struct device *info; diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index 680cedd0f18..86495f977a9 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -42,6 +42,8 @@ This module contains routines that are used to initialize the nanokernel. #include #include #include +#include +#include /* kernel build timestamp items */ @@ -118,6 +120,34 @@ extern void _Ctors(void); #define initialize_nano_timeouts() do { } while ((0)) #endif +/********************************************************************** + * + * In the nanokernel only configuration we still want to run the + * app_{early,late}_init levels to maintain the correct semantics. In + * a microkernel configuration these init levels are run in the + * microkernel initialization. + * + */ + +#ifdef CONFIG_NANOKERNEL +static void _main(void) +{ + _sys_device_do_config_level(NANO_EARLY); + _sys_device_do_config_level(NANO_LATE); + _sys_device_do_config_level(APP_EARLY); + _sys_device_do_config_level(APP_EARLY); + main(); +} +#else +static void _main(void) +{ + _sys_device_do_config_level(NANO_EARLY); + _sys_device_do_config_level(NANO_LATE); + main(); +} + +#endif + /******************************************************************************* * * nano_init - initializes nanokernel data structures @@ -169,7 +199,7 @@ static void nano_init(tCCS *dummyOutContext) _NewContext(main_task_stack, /* pStackMem */ CONFIG_MAIN_STACK_SIZE, /* stackSize */ - (_ContextEntry)main, /* pEntry */ + (_ContextEntry)_main, /* pEntry */ (_ContextArg)0, /* parameter1 */ (_ContextArg)0, /* parameter2 */ (_ContextArg)0, /* parameter3 */ @@ -252,6 +282,7 @@ FUNC_NORETURN void _Cstart(void) /* perform basic hardware initialization */ _InitHardware(); + _sys_device_do_config_level(PURE); /* * Initialize random number generator