4dcfb5531c
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>
167 lines
4.4 KiB
C
167 lines
4.4 KiB
C
/*
|
|
* Copyright (c) 2017-2019 Oticon A/S
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* Driver for the timer model of the POSIX native_posix board
|
|
* It provides the interfaces required by the kernel and the sanity testcases
|
|
* It also provides a custom k_busy_wait() which can be used with the
|
|
* POSIX arch and InfClock SOC
|
|
*/
|
|
#include "zephyr/types.h"
|
|
#include "irq.h"
|
|
#include "device.h"
|
|
#include <drivers/timer/system_timer.h>
|
|
#include "sys_clock.h"
|
|
#include "timer_model.h"
|
|
#include "soc.h"
|
|
#include <arch/posix/posix_trace.h>
|
|
|
|
static uint64_t tick_period; /* System tick period in microseconds */
|
|
/* Time (microseconds since boot) of the last timer tick interrupt */
|
|
static uint64_t last_tick_time;
|
|
|
|
/**
|
|
* Return the current HW cycle counter
|
|
* (number of microseconds since boot in 32bits)
|
|
*/
|
|
uint32_t z_timer_cycle_get_32(void)
|
|
{
|
|
return hwm_get_time();
|
|
}
|
|
|
|
/**
|
|
* Interrupt handler for the timer interrupt
|
|
* Announce to the kernel that a number of ticks have passed
|
|
*/
|
|
static void np_timer_isr(const void *arg)
|
|
{
|
|
ARG_UNUSED(arg);
|
|
|
|
uint64_t now = hwm_get_time();
|
|
int32_t elapsed_ticks = (now - last_tick_time)/tick_period;
|
|
|
|
last_tick_time += elapsed_ticks*tick_period;
|
|
z_clock_announce(elapsed_ticks);
|
|
}
|
|
|
|
/*
|
|
* @brief Initialize system timer driver
|
|
*
|
|
* Enable the hw timer, setting its tick period, and setup its interrupt
|
|
*/
|
|
int z_clock_driver_init(const struct device *device)
|
|
{
|
|
ARG_UNUSED(device);
|
|
|
|
tick_period = 1000000ul / CONFIG_SYS_CLOCK_TICKS_PER_SEC;
|
|
|
|
last_tick_time = hwm_get_time();
|
|
hwtimer_enable(tick_period);
|
|
|
|
IRQ_CONNECT(TIMER_TICK_IRQ, 1, np_timer_isr, 0, 0);
|
|
irq_enable(TIMER_TICK_IRQ);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* @brief Set system clock timeout
|
|
*
|
|
* Informs the system clock driver that the next needed call to
|
|
* z_clock_announce() will not be until the specified number of ticks
|
|
* from the the current time have elapsed.
|
|
*
|
|
* See system_timer.h for more information
|
|
*
|
|
* @param ticks Timeout in tick units
|
|
* @param idle Hint to the driver that the system is about to enter
|
|
* the idle state immediately after setting the timeout
|
|
*/
|
|
void z_clock_set_timeout(int32_t ticks, bool idle)
|
|
{
|
|
ARG_UNUSED(idle);
|
|
|
|
#if defined(CONFIG_TICKLESS_KERNEL)
|
|
uint64_t silent_ticks;
|
|
|
|
/* Note that we treat INT_MAX literally as anyhow the maximum amount of
|
|
* ticks we can report with z_clock_announce() is INT_MAX
|
|
*/
|
|
if (ticks == K_TICKS_FOREVER) {
|
|
silent_ticks = INT64_MAX;
|
|
} else if (ticks > 0) {
|
|
silent_ticks = ticks - 1;
|
|
} else {
|
|
silent_ticks = 0;
|
|
}
|
|
hwtimer_set_silent_ticks(silent_ticks);
|
|
#endif
|
|
}
|
|
|
|
/**
|
|
* @brief Ticks elapsed since last z_clock_announce() call
|
|
*
|
|
* Queries the clock driver for the current time elapsed since the
|
|
* last call to z_clock_announce() was made. The kernel will call
|
|
* this with appropriate locking, the driver needs only provide an
|
|
* instantaneous answer.
|
|
*/
|
|
uint32_t z_clock_elapsed(void)
|
|
{
|
|
return (hwm_get_time() - last_tick_time)/tick_period;
|
|
}
|
|
|
|
|
|
#if defined(CONFIG_ARCH_HAS_CUSTOM_BUSY_WAIT)
|
|
/**
|
|
* Replacement to the kernel k_busy_wait()
|
|
* Will block this thread (and therefore the whole zephyr) during usec_to_wait
|
|
*
|
|
* Note that interrupts may be received in the meanwhile and that therefore this
|
|
* thread may loose context
|
|
*
|
|
* This special arch_busy_wait() is necessary due to how the POSIX arch/SOC INF
|
|
* models a CPU. Conceptually it could be thought as if the MCU was running
|
|
* at an infinitely high clock, and therefore no simulated time passes while
|
|
* executing instructions(*1).
|
|
* Therefore to be able to busy wait this function does the equivalent of
|
|
* programming a dedicated timer which will raise a non-maskable interrupt,
|
|
* and halting the CPU.
|
|
*
|
|
* (*1) In reality simulated time is simply not advanced just due to the "MCU"
|
|
* running. Meaning, the SW running on the MCU is assumed to take 0 time.
|
|
*/
|
|
void arch_busy_wait(uint32_t usec_to_wait)
|
|
{
|
|
uint64_t time_end = hwm_get_time() + usec_to_wait;
|
|
|
|
while (hwm_get_time() < time_end) {
|
|
/*
|
|
* There may be wakes due to other interrupts including
|
|
* other threads calling arch_busy_wait
|
|
*/
|
|
hwtimer_wake_in_time(time_end);
|
|
posix_halt_cpu();
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYSTEM_CLOCK_DISABLE)
|
|
/**
|
|
*
|
|
* @brief Stop announcing sys ticks into the kernel
|
|
*
|
|
* Disable the system ticks generation
|
|
*
|
|
* @return N/A
|
|
*/
|
|
void sys_clock_disable(void)
|
|
{
|
|
irq_disable(TIMER_TICK_IRQ);
|
|
hwtimer_set_silent_ticks(INT64_MAX);
|
|
}
|
|
#endif /* CONFIG_SYSTEM_CLOCK_DISABLE */
|