a5fd0d184a
The init infrastructure, found in `init.h`, is currently used by:
- `SYS_INIT`: to call functions before `main`
- `DEVICE_*`: to initialize devices
They are all sorted according to an initialization level + a priority.
`SYS_INIT` calls are really orthogonal to devices, however, the required
function signature requires a `const struct device *dev` as a first
argument. The only reason for that is because the same init machinery is
used by devices, so we have something like:
```c
struct init_entry {
int (*init)(const struct device *dev);
/* only set by DEVICE_*, otherwise NULL */
const struct device *dev;
}
```
As a result, we end up with such weird/ugly pattern:
```c
static int my_init(const struct device *dev)
{
/* always NULL! add ARG_UNUSED to avoid compiler warning */
ARG_UNUSED(dev);
...
}
```
This is really a result of poor internals isolation. This patch proposes
a to make init entries more flexible so that they can accept sytem
initialization calls like this:
```c
static int my_init(void)
{
...
}
```
This is achieved using a union:
```c
union init_function {
/* for SYS_INIT, used when init_entry.dev == NULL */
int (*sys)(void);
/* for DEVICE*, used when init_entry.dev != NULL */
int (*dev)(const struct device *dev);
};
struct init_entry {
/* stores init function (either for SYS_INIT or DEVICE*)
union init_function init_fn;
/* stores device pointer for DEVICE*, NULL for SYS_INIT. Allows
* to know which union entry to call.
*/
const struct device *dev;
}
```
This solution **does not increase ROM usage**, and allows to offer clean
public APIs for both SYS_INIT and DEVICE*. Note that however, init
machinery keeps a coupling with devices.
**NOTE**: This is a breaking change! All `SYS_INIT` functions will need
to be converted to the new signature. See the script offered in the
following commit.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
init: convert SYS_INIT functions to the new signature
Conversion scripted using scripts/utils/migrate_sys_init.py.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
manifest: update projects for SYS_INIT changes
Update modules with updated SYS_INIT calls:
- hal_ti
- lvgl
- sof
- TraceRecorderSource
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
tests: devicetree: devices: adjust test
Adjust test according to the recently introduced SYS_INIT
infrastructure.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
tests: kernel: threads: adjust SYS_INIT call
Adjust to the new signature: int (*init_fn)(void);
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
69 lines
1.6 KiB
C
69 lines
1.6 KiB
C
/*
|
|
* Copyright (c) 2018 Synopsys, Inc. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/device.h>
|
|
#include <zephyr/kernel.h>
|
|
#include <errno.h>
|
|
#include <zephyr/types.h>
|
|
#include <zephyr/init.h>
|
|
#include <zephyr/toolchain.h>
|
|
|
|
#include <zephyr/arch/arc/v2/secureshield/arc_secure.h>
|
|
|
|
static void _default_sjli_entry(void);
|
|
/*
|
|
* sjli vector table must be in instruction space
|
|
* \todo: how to let user to install customized sjli entry easily, e.g.
|
|
* through macros or with the help of compiler?
|
|
*/
|
|
const static uint32_t _sjli_vector_table[CONFIG_SJLI_TABLE_SIZE] = {
|
|
[0] = (uint32_t)_arc_do_secure_call,
|
|
[1 ... (CONFIG_SJLI_TABLE_SIZE - 1)] = (uint32_t)_default_sjli_entry,
|
|
};
|
|
|
|
/*
|
|
* @brief default entry of sjli call
|
|
*
|
|
*/
|
|
static void _default_sjli_entry(void)
|
|
{
|
|
printk("default sjli entry\n");
|
|
}
|
|
|
|
/*
|
|
* @brief initialization of sjli related functions
|
|
*
|
|
*/
|
|
static void sjli_table_init(void)
|
|
{
|
|
/* install SJLI table */
|
|
z_arc_v2_aux_reg_write(_ARC_V2_NSC_TABLE_BASE, _sjli_vector_table);
|
|
z_arc_v2_aux_reg_write(_ARC_V2_NSC_TABLE_TOP,
|
|
(_sjli_vector_table + CONFIG_SJLI_TABLE_SIZE));
|
|
}
|
|
|
|
/*
|
|
* @brief initialization of secureshield related functions.
|
|
*/
|
|
static int arc_secureshield_init(void)
|
|
{
|
|
sjli_table_init();
|
|
|
|
/* set nic bit to enable seti/clri and
|
|
* sleep/wevt in normal mode.
|
|
* If not set, direct call of seti/clri etc. will raise exception.
|
|
* Then, these seti/clri instructions should be replaced with secure
|
|
* secure services (sjli call)
|
|
*
|
|
*/
|
|
__asm__ volatile("sflag 0x20");
|
|
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(arc_secureshield_init, PRE_KERNEL_1,
|
|
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
|