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>
73 lines
1.8 KiB
C
73 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2018 Intel Corporation.
|
|
* Copyright (c) 2021 Nordic Semiconductor ASA.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include "pm_stats.h"
|
|
|
|
#include <zephyr/init.h>
|
|
#include <zephyr/kernel.h>
|
|
#include <zephyr/stats/stats.h>
|
|
#include <zephyr/sys/printk.h>
|
|
|
|
STATS_SECT_START(pm_stats)
|
|
STATS_SECT_ENTRY32(state_count)
|
|
STATS_SECT_ENTRY32(state_last_cycles)
|
|
STATS_SECT_ENTRY32(state_total_cycles)
|
|
STATS_SECT_END;
|
|
|
|
STATS_NAME_START(pm_stats)
|
|
STATS_NAME(pm_stats, state_count)
|
|
STATS_NAME(pm_stats, state_last_cycles)
|
|
STATS_NAME(pm_stats, state_total_cycles)
|
|
STATS_NAME_END(pm_stats);
|
|
|
|
static STATS_SECT_DECL(pm_stats) stats[CONFIG_MP_MAX_NUM_CPUS][PM_STATE_COUNT];
|
|
|
|
#define PM_STAT_NAME_LEN sizeof("pm_cpu_XXX_state_X_stats")
|
|
static char names[CONFIG_MP_MAX_NUM_CPUS][PM_STATE_COUNT][PM_STAT_NAME_LEN];
|
|
static uint32_t time_start[CONFIG_MP_MAX_NUM_CPUS];
|
|
static uint32_t time_stop[CONFIG_MP_MAX_NUM_CPUS];
|
|
|
|
static int pm_stats_init(void)
|
|
{
|
|
|
|
unsigned int num_cpus = arch_num_cpus();
|
|
|
|
for (uint8_t i = 0U; i < num_cpus; i++) {
|
|
for (uint8_t j = 0U; j < PM_STATE_COUNT; j++) {
|
|
snprintk(names[i][j], PM_STAT_NAME_LEN,
|
|
"pm_cpu_%03d_state_%1d_stats", i, j);
|
|
stats_init(&(stats[i][j].s_hdr), STATS_SIZE_32, 3U,
|
|
STATS_NAME_INIT_PARMS(pm_stats));
|
|
stats_register(names[i][j], &(stats[i][j].s_hdr));
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(pm_stats_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
|
|
|
|
void pm_stats_start(void)
|
|
{
|
|
time_start[_current_cpu->id] = k_cycle_get_32();
|
|
}
|
|
|
|
void pm_stats_stop(void)
|
|
{
|
|
time_stop[_current_cpu->id] = k_cycle_get_32();
|
|
}
|
|
|
|
void pm_stats_update(enum pm_state state)
|
|
{
|
|
uint8_t cpu = _current_cpu->id;
|
|
uint32_t time_total = time_stop[cpu] - time_start[cpu];
|
|
|
|
STATS_INC(stats[cpu][state], state_count);
|
|
STATS_INCN(stats[cpu][state], state_total_cycles, time_total);
|
|
STATS_SET(stats[cpu][state], state_last_cycles, time_total);
|
|
}
|