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>
99 lines
2.7 KiB
C
99 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#define DT_DRV_COMPAT litex_timer0
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <zephyr/arch/cpu.h>
|
|
#include <zephyr/device.h>
|
|
#include <zephyr/irq.h>
|
|
#include <zephyr/spinlock.h>
|
|
#include <zephyr/drivers/timer/system_timer.h>
|
|
|
|
#define TIMER_LOAD_ADDR DT_INST_REG_ADDR_BY_NAME(0, load)
|
|
#define TIMER_RELOAD_ADDR DT_INST_REG_ADDR_BY_NAME(0, reload)
|
|
#define TIMER_EN_ADDR DT_INST_REG_ADDR_BY_NAME(0, en)
|
|
#define TIMER_UPDATE_VALUE_ADDR DT_INST_REG_ADDR_BY_NAME(0, update_value)
|
|
#define TIMER_VALUE_ADDR DT_INST_REG_ADDR_BY_NAME(0, value)
|
|
#define TIMER_EV_STATUS_ADDR DT_INST_REG_ADDR_BY_NAME(0, ev_status)
|
|
#define TIMER_EV_PENDING_ADDR DT_INST_REG_ADDR_BY_NAME(0, ev_pending)
|
|
#define TIMER_EV_ENABLE_ADDR DT_INST_REG_ADDR_BY_NAME(0, ev_enable)
|
|
#define TIMER_UPTIME_LATCH_ADDR DT_INST_REG_ADDR_BY_NAME(0, uptime_latch)
|
|
#define TIMER_UPTIME_CYCLES_ADDR DT_INST_REG_ADDR_BY_NAME(0, uptime_cycles)
|
|
|
|
#define TIMER_EV 0x1
|
|
#define TIMER_IRQ DT_INST_IRQN(0)
|
|
#define TIMER_DISABLE 0x0
|
|
#define TIMER_ENABLE 0x1
|
|
#define TIMER_UPTIME_LATCH 0x1
|
|
#if defined(CONFIG_TEST)
|
|
const int32_t z_sys_timer_irq_for_test = TIMER_IRQ;
|
|
#endif
|
|
|
|
static void litex_timer_irq_handler(const void *device)
|
|
{
|
|
unsigned int key = irq_lock();
|
|
|
|
litex_write8(TIMER_EV, TIMER_EV_PENDING_ADDR);
|
|
sys_clock_announce(1);
|
|
|
|
irq_unlock(key);
|
|
}
|
|
|
|
uint32_t sys_clock_cycle_get_32(void)
|
|
{
|
|
static struct k_spinlock lock;
|
|
uint32_t uptime_cycles;
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
|
|
|
litex_write8(TIMER_UPTIME_LATCH, TIMER_UPTIME_LATCH_ADDR);
|
|
uptime_cycles = (uint32_t)litex_read64(TIMER_UPTIME_CYCLES_ADDR);
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
return uptime_cycles;
|
|
}
|
|
|
|
uint64_t sys_clock_cycle_get_64(void)
|
|
{
|
|
static struct k_spinlock lock;
|
|
uint64_t uptime_cycles;
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
|
|
|
litex_write8(TIMER_UPTIME_LATCH, TIMER_UPTIME_LATCH_ADDR);
|
|
uptime_cycles = litex_read64(TIMER_UPTIME_CYCLES_ADDR);
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
return uptime_cycles;
|
|
}
|
|
|
|
/* tickless kernel is not supported */
|
|
uint32_t sys_clock_elapsed(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int sys_clock_driver_init(void)
|
|
{
|
|
IRQ_CONNECT(TIMER_IRQ, DT_INST_IRQ(0, priority),
|
|
litex_timer_irq_handler, NULL, 0);
|
|
irq_enable(TIMER_IRQ);
|
|
|
|
litex_write8(TIMER_DISABLE, TIMER_EN_ADDR);
|
|
|
|
litex_write32(k_ticks_to_cyc_floor32(1), TIMER_RELOAD_ADDR);
|
|
litex_write32(k_ticks_to_cyc_floor32(1), TIMER_LOAD_ADDR);
|
|
|
|
litex_write8(TIMER_ENABLE, TIMER_EN_ADDR);
|
|
litex_write8(litex_read8(TIMER_EV_PENDING_ADDR), TIMER_EV_PENDING_ADDR);
|
|
litex_write8(TIMER_EV, TIMER_EV_ENABLE_ADDR);
|
|
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
|
|
CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
|