2019-03-28 14:40:03 +01:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2018 - 2019 Antmicro <www.antmicro.com>
|
|
|
|
|
*
|
|
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
|
|
|
*/
|
|
|
|
|
|
2020-03-24 21:58:31 +01:00
|
|
|
#define DT_DRV_COMPAT litex_timer0
|
|
|
|
|
|
2022-05-06 10:25:46 +02:00
|
|
|
#include <zephyr/kernel.h>
|
|
|
|
|
#include <zephyr/arch/cpu.h>
|
2023-08-28 13:15:43 +02:00
|
|
|
#include <zephyr/init.h>
|
2022-05-06 10:25:46 +02:00
|
|
|
#include <zephyr/irq.h>
|
|
|
|
|
#include <zephyr/spinlock.h>
|
|
|
|
|
#include <zephyr/drivers/timer/system_timer.h>
|
2019-03-28 14:40:03 +01:00
|
|
|
|
2024-01-18 16:22:43 +01:00
|
|
|
#include <soc.h>
|
|
|
|
|
|
2022-05-06 13:12:13 +02:00
|
|
|
#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)
|
2022-04-11 14:53:53 +02:00
|
|
|
|
|
|
|
|
#define TIMER_EV 0x1
|
|
|
|
|
#define TIMER_IRQ DT_INST_IRQN(0)
|
|
|
|
|
#define TIMER_DISABLE 0x0
|
|
|
|
|
#define TIMER_ENABLE 0x1
|
2022-05-06 13:12:13 +02:00
|
|
|
#define TIMER_UPTIME_LATCH 0x1
|
2022-06-28 23:58:40 +02:00
|
|
|
#if defined(CONFIG_TEST)
|
|
|
|
|
const int32_t z_sys_timer_irq_for_test = TIMER_IRQ;
|
|
|
|
|
#endif
|
2019-03-28 14:40:03 +01:00
|
|
|
|
isr: Normalize usage of device instance through ISR
The goal of this patch is to replace the 'void *' parameter by 'struct
device *' if they use such variable or just 'const void *' on all
relevant ISRs
This will avoid not-so-nice const qualifier tweaks when device instances
will be constant.
Note that only the ISR passed to IRQ_CONNECT are of interest here.
In order to do so, the script fix_isr.py below is necessary:
from pathlib import Path
import subprocess
import pickle
import mmap
import sys
import re
import os
cocci_template = """
@r_fix_isr_0
@
type ret_type;
identifier P;
identifier D;
@@
-ret_type <!fn!>(void *P)
+ret_type <!fn!>(const struct device *P)
{
...
(
const struct device *D = (const struct device *)P;
|
const struct device *D = P;
)
...
}
@r_fix_isr_1
@
type ret_type;
identifier P;
identifier D;
@@
-ret_type <!fn!>(void *P)
+ret_type <!fn!>(const struct device *P)
{
...
const struct device *D;
...
(
D = (const struct device *)P;
|
D = P;
)
...
}
@r_fix_isr_2
@
type ret_type;
identifier A;
@@
-ret_type <!fn!>(void *A)
+ret_type <!fn!>(const void *A)
{
...
}
@r_fix_isr_3
@
const struct device *D;
@@
-<!fn!>((void *)D);
+<!fn!>(D);
@r_fix_isr_4
@
type ret_type;
identifier D;
identifier P;
@@
-ret_type <!fn!>(const struct device *P)
+ret_type <!fn!>(const struct device *D)
{
...
(
-const struct device *D = (const struct device *)P;
|
-const struct device *D = P;
)
...
}
@r_fix_isr_5
@
type ret_type;
identifier D;
identifier P;
@@
-ret_type <!fn!>(const struct device *P)
+ret_type <!fn!>(const struct device *D)
{
...
-const struct device *D;
...
(
-D = (const struct device *)P;
|
-D = P;
)
...
}
"""
def find_isr(fn):
db = []
data = None
start = 0
try:
with open(fn, 'r+') as f:
data = str(mmap.mmap(f.fileno(), 0).read())
except Exception as e:
return db
while True:
isr = ""
irq = data.find('IRQ_CONNECT', start)
while irq > -1:
p = 1
arg = 1
p_o = data.find('(', irq)
if p_o < 0:
irq = -1
break;
pos = p_o + 1
while p > 0:
if data[pos] == ')':
p -= 1
elif data[pos] == '(':
p += 1
elif data[pos] == ',' and p == 1:
arg += 1
if arg == 3:
isr += data[pos]
pos += 1
isr = isr.strip(',\\n\\t ')
if isr not in db and len(isr) > 0:
db.append(isr)
start = pos
break
if irq < 0:
break
return db
def patch_isr(fn, isr_list):
if len(isr_list) <= 0:
return
for isr in isr_list:
tmplt = cocci_template.replace('<!fn!>', isr)
with open('/tmp/isr_fix.cocci', 'w') as f:
f.write(tmplt)
cmd = ['spatch', '--sp-file', '/tmp/isr_fix.cocci', '--in-place', fn]
subprocess.run(cmd)
def process_files(path):
if path.is_file() and path.suffix in ['.h', '.c']:
p = str(path.parent) + '/' + path.name
isr_list = find_isr(p)
patch_isr(p, isr_list)
elif path.is_dir():
for p in path.iterdir():
process_files(p)
if len(sys.argv) < 2:
print("You need to provide a dir/file path")
sys.exit(1)
process_files(Path(sys.argv[1]))
And is run: ./fix_isr.py <zephyr root directory>
Finally, some files needed manual fixes such.
Fixes #27399
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-06-17 14:58:56 +02:00
|
|
|
static void litex_timer_irq_handler(const void *device)
|
2019-03-28 14:40:03 +01:00
|
|
|
{
|
2022-07-13 16:50:25 +02:00
|
|
|
unsigned int key = irq_lock();
|
2019-03-28 14:40:03 +01:00
|
|
|
|
2022-04-08 14:44:34 +02:00
|
|
|
litex_write8(TIMER_EV, TIMER_EV_PENDING_ADDR);
|
2021-02-25 21:33:15 +01:00
|
|
|
sys_clock_announce(1);
|
2019-03-28 14:40:03 +01:00
|
|
|
|
|
|
|
|
irq_unlock(key);
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-12 18:46:52 +01:00
|
|
|
uint32_t sys_clock_cycle_get_32(void)
|
2019-03-28 14:40:03 +01:00
|
|
|
{
|
2020-05-18 17:32:22 +02:00
|
|
|
static struct k_spinlock lock;
|
2022-05-06 13:12:13 +02:00
|
|
|
uint32_t uptime_cycles;
|
2020-05-18 17:32:22 +02:00
|
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
|
|
|
|
|
2022-05-06 13:12:13 +02:00
|
|
|
litex_write8(TIMER_UPTIME_LATCH, TIMER_UPTIME_LATCH_ADDR);
|
|
|
|
|
uptime_cycles = (uint32_t)litex_read64(TIMER_UPTIME_CYCLES_ADDR);
|
2020-05-18 17:32:22 +02:00
|
|
|
|
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
|
|
2022-05-06 13:12:13 +02:00
|
|
|
return uptime_cycles;
|
2019-03-28 14:40:03 +01:00
|
|
|
}
|
|
|
|
|
|
2021-10-30 02:10:35 +02:00
|
|
|
uint64_t sys_clock_cycle_get_64(void)
|
|
|
|
|
{
|
|
|
|
|
static struct k_spinlock lock;
|
2022-05-06 13:12:13 +02:00
|
|
|
uint64_t uptime_cycles;
|
2021-10-30 02:10:35 +02:00
|
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
|
|
|
|
|
2022-05-06 13:12:13 +02:00
|
|
|
litex_write8(TIMER_UPTIME_LATCH, TIMER_UPTIME_LATCH_ADDR);
|
|
|
|
|
uptime_cycles = litex_read64(TIMER_UPTIME_CYCLES_ADDR);
|
2021-10-30 02:10:35 +02:00
|
|
|
|
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
|
|
2022-05-06 13:12:13 +02:00
|
|
|
return uptime_cycles;
|
2021-10-30 02:10:35 +02:00
|
|
|
}
|
|
|
|
|
|
2019-03-28 14:40:03 +01:00
|
|
|
/* tickless kernel is not supported */
|
2021-02-25 21:33:15 +01:00
|
|
|
uint32_t sys_clock_elapsed(void)
|
2019-03-28 14:40:03 +01:00
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
init: remove the need for a dummy device pointer in SYS_INIT functions
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>
2022-10-19 09:33:44 +02:00
|
|
|
static int sys_clock_driver_init(void)
|
2019-03-28 14:40:03 +01:00
|
|
|
{
|
2020-03-24 21:58:31 +01:00
|
|
|
IRQ_CONNECT(TIMER_IRQ, DT_INST_IRQ(0, priority),
|
2019-03-28 14:40:03 +01:00
|
|
|
litex_timer_irq_handler, NULL, 0);
|
|
|
|
|
irq_enable(TIMER_IRQ);
|
|
|
|
|
|
2022-04-08 14:44:34 +02:00
|
|
|
litex_write8(TIMER_DISABLE, TIMER_EN_ADDR);
|
2019-03-28 14:40:03 +01:00
|
|
|
|
2022-04-08 14:44:34 +02:00
|
|
|
litex_write32(k_ticks_to_cyc_floor32(1), TIMER_RELOAD_ADDR);
|
|
|
|
|
litex_write32(k_ticks_to_cyc_floor32(1), TIMER_LOAD_ADDR);
|
2019-03-28 14:40:03 +01:00
|
|
|
|
2022-04-08 14:44:34 +02:00
|
|
|
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);
|
2019-03-28 14:40:03 +01:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2021-11-04 12:51:39 +01:00
|
|
|
|
|
|
|
|
SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
|
|
|
|
|
CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
|