2020-01-07 07:31:41 +01:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2020 Intel Corporation
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
|
|
*/
|
2021-11-04 12:51:39 +01:00
|
|
|
#include <device.h>
|
2020-01-07 07:31:41 +01:00
|
|
|
#include <drivers/timer/system_timer.h>
|
|
|
|
#include <sys_clock.h>
|
|
|
|
#include <spinlock.h>
|
2021-09-07 18:42:47 +02:00
|
|
|
#include <cavs-idc.h>
|
soc: intel_adsp: Clean up shim driver
Each platform was defining its own shim.h header, with slightly
variant field definitions, for a register block that is almost
completely compatible between versions. This is made worse by the
fact that these represent an API imported fairly early from SOF, the
upstream version of which has since diverged.
Move the existing shim struct into a header ("cavs-shim.h") of its
own, remove a bunch of unused symbols, fill in definitions for some
registers that were left out, correct naming to match the hardware
docs in a few places, make sure all hardware dependencies are source
from devicetree only, and modify existing usage to use the new API
exclusively.
Interestingly this leaves the older shim.h header in place, as it
turns out to contain definitions for a bunch of things that were never
part of the shim register block. Those will be unified in separate
patches.
Finally: note that the existing IPM_CAVS_IDC driver (soon to be
removed from all the intel_adsp soc's) is still using the old API, so
redeclare the minimal subset that it needs for the benefit of the
platforms in transition.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2021-09-06 00:27:46 +02:00
|
|
|
#include <cavs-shim.h>
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @file
|
|
|
|
* @brief CAVS DSP Wall Clock Timer driver
|
|
|
|
*
|
|
|
|
* The CAVS DSP on Intel SoC has a timer with one counter and two compare
|
|
|
|
* registers that is external to the CPUs. This timer is accessible from
|
|
|
|
* all available CPU cores and provides a synchronized timer under SMP.
|
|
|
|
*/
|
|
|
|
|
2021-12-15 22:12:50 +01:00
|
|
|
#define COMPARATOR_IDX 0 /* 0 or 1 */
|
|
|
|
|
|
|
|
#define TIMER_IRQ DSP_WCT_IRQ(COMPARATOR_IDX)
|
|
|
|
|
2020-01-07 07:31:41 +01:00
|
|
|
#define CYC_PER_TICK (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC \
|
|
|
|
/ CONFIG_SYS_CLOCK_TICKS_PER_SEC)
|
|
|
|
#define MAX_CYC 0xFFFFFFFFUL
|
|
|
|
#define MAX_TICKS ((MAX_CYC - CYC_PER_TICK) / CYC_PER_TICK)
|
|
|
|
#define MIN_DELAY (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC / 100000)
|
|
|
|
|
|
|
|
BUILD_ASSERT(MIN_DELAY < CYC_PER_TICK);
|
2021-12-15 22:12:50 +01:00
|
|
|
BUILD_ASSERT(COMPARATOR_IDX >= 0 && COMPARATOR_IDX <= 1);
|
|
|
|
|
|
|
|
#define WCTCS (&CAVS_SHIM.dspwctcs)
|
|
|
|
#define COUNTER_HI (&CAVS_SHIM.dspwc_hi)
|
|
|
|
#define COUNTER_LO (&CAVS_SHIM.dspwc_lo)
|
|
|
|
#define COMPARE_HI (&CAVS_SHIM.UTIL_CAT(UTIL_CAT(dspwct, COMPARATOR_IDX), c_hi))
|
|
|
|
#define COMPARE_LO (&CAVS_SHIM.UTIL_CAT(UTIL_CAT(dspwct, COMPARATOR_IDX), c_lo))
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
static struct k_spinlock lock;
|
2020-05-27 18:26:57 +02:00
|
|
|
static uint64_t last_count;
|
2020-01-07 07:31:41 +01:00
|
|
|
|
2020-05-27 18:26:57 +02:00
|
|
|
static void set_compare(uint64_t time)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
2020-05-30 16:27:52 +02:00
|
|
|
/* Disarm the comparator to prevent spurious triggers */
|
2021-12-15 22:12:50 +01:00
|
|
|
*WCTCS &= ~DSP_WCT_CS_TA(COMPARATOR_IDX);
|
soc: intel_adsp: Clean up shim driver
Each platform was defining its own shim.h header, with slightly
variant field definitions, for a register block that is almost
completely compatible between versions. This is made worse by the
fact that these represent an API imported fairly early from SOF, the
upstream version of which has since diverged.
Move the existing shim struct into a header ("cavs-shim.h") of its
own, remove a bunch of unused symbols, fill in definitions for some
registers that were left out, correct naming to match the hardware
docs in a few places, make sure all hardware dependencies are source
from devicetree only, and modify existing usage to use the new API
exclusively.
Interestingly this leaves the older shim.h header in place, as it
turns out to contain definitions for a bunch of things that were never
part of the shim register block. Those will be unified in separate
patches.
Finally: note that the existing IPM_CAVS_IDC driver (soon to be
removed from all the intel_adsp soc's) is still using the old API, so
redeclare the minimal subset that it needs for the benefit of the
platforms in transition.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2021-09-06 00:27:46 +02:00
|
|
|
|
2021-12-15 22:12:50 +01:00
|
|
|
*COMPARE_LO = (uint32_t)time;
|
|
|
|
*COMPARE_HI = (uint32_t)(time >> 32);
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
/* Arm the timer */
|
2021-12-15 22:12:50 +01:00
|
|
|
*WCTCS |= DSP_WCT_CS_TA(COMPARATOR_IDX);
|
2020-01-07 07:31:41 +01:00
|
|
|
}
|
|
|
|
|
2020-05-27 18:26:57 +02:00
|
|
|
static uint64_t count(void)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
2021-02-04 00:06:33 +01:00
|
|
|
/* The count register is 64 bits, but we're a 32 bit CPU that
|
|
|
|
* can only read four bytes at a time, so a bit of care is
|
|
|
|
* needed to prevent racing against a wraparound of the low
|
|
|
|
* word. Wrap the low read between two reads of the high word
|
|
|
|
* and make sure it didn't change.
|
|
|
|
*/
|
|
|
|
uint32_t hi0, hi1, lo;
|
|
|
|
|
|
|
|
do {
|
2021-12-15 22:12:50 +01:00
|
|
|
hi0 = *COUNTER_HI;
|
|
|
|
lo = *COUNTER_LO;
|
|
|
|
hi1 = *COUNTER_HI;
|
2021-02-04 00:06:33 +01:00
|
|
|
} while (hi0 != hi1);
|
|
|
|
|
|
|
|
return (((uint64_t)hi0) << 32) | lo;
|
2020-01-07 07:31:41 +01:00
|
|
|
}
|
|
|
|
|
2020-05-27 18:26:57 +02:00
|
|
|
static uint32_t count32(void)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
2021-12-15 22:12:50 +01:00
|
|
|
return *COUNTER_LO;
|
2020-01-07 07:31:41 +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 compare_isr(const void *arg)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
|
|
|
ARG_UNUSED(arg);
|
2020-05-27 18:26:57 +02:00
|
|
|
uint64_t curr;
|
|
|
|
uint32_t dticks;
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
|
|
|
|
|
|
|
curr = count();
|
2020-05-27 18:26:57 +02:00
|
|
|
dticks = (uint32_t)((curr - last_count) / CYC_PER_TICK);
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
/* Clear the triggered bit */
|
2021-12-15 22:12:50 +01:00
|
|
|
*WCTCS |= DSP_WCT_CS_TT(COMPARATOR_IDX);
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
last_count += dticks * CYC_PER_TICK;
|
|
|
|
|
|
|
|
#ifndef CONFIG_TICKLESS_KERNEL
|
2020-05-27 18:26:57 +02:00
|
|
|
uint64_t next = last_count + CYC_PER_TICK;
|
2020-01-07 07:31:41 +01:00
|
|
|
|
2020-05-27 18:26:57 +02:00
|
|
|
if ((int64_t)(next - curr) < MIN_DELAY) {
|
2020-01-07 07:31:41 +01:00
|
|
|
next += CYC_PER_TICK;
|
|
|
|
}
|
|
|
|
set_compare(next);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
|
2021-02-25 21:33:15 +01:00
|
|
|
sys_clock_announce(dticks);
|
2020-01-07 07:31:41 +01:00
|
|
|
}
|
|
|
|
|
2021-02-25 21:33:15 +01:00
|
|
|
void sys_clock_set_timeout(int32_t ticks, bool idle)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
|
|
|
ARG_UNUSED(idle);
|
|
|
|
|
|
|
|
#ifdef CONFIG_TICKLESS_KERNEL
|
kernel/timeout: Make timeout arguments an opaque type
Add a k_timeout_t type, and use it everywhere that kernel API
functions were accepting a millisecond timeout argument. Instead of
forcing milliseconds everywhere (which are often not integrally
representable as system ticks), do the conversion to ticks at the
point where the timeout is created. This avoids an extra unit
conversion in some application code, and allows us to express the
timeout in units other than milliseconds to achieve greater precision.
The existing K_MSEC() et. al. macros now return initializers for a
k_timeout_t.
The K_NO_WAIT and K_FOREVER constants have now become k_timeout_t
values, which means they cannot be operated on as integers.
Applications which have their own APIs that need to inspect these
vs. user-provided timeouts can now use a K_TIMEOUT_EQ() predicate to
test for equality.
Timer drivers, which receive an integer tick count in ther
z_clock_set_timeout() functions, now use the integer-valued
K_TICKS_FOREVER constant instead of K_FOREVER.
For the initial release, to preserve source compatibility, a
CONFIG_LEGACY_TIMEOUT_API kconfig is provided. When true, the
k_timeout_t will remain a compatible 32 bit value that will work with
any legacy Zephyr application.
Some subsystems present timeout (or timeout-like) values to their own
users as APIs that would re-use the kernel's own constants and
conventions. These will require some minor design work to adapt to
the new scheme (in most cases just using k_timeout_t directly in their
own API), and they have not been changed in this patch, instead
selecting CONFIG_LEGACY_TIMEOUT_API via kconfig. These subsystems
include: CAN Bus, the Microbit display driver, I2S, LoRa modem
drivers, the UART Async API, Video hardware drivers, the console
subsystem, and the network buffer abstraction.
k_sleep() now takes a k_timeout_t argument, with a k_msleep() variant
provided that works identically to the original API.
Most of the changes here are just type/configuration management and
documentation, but there are logic changes in mempool, where a loop
that used a timeout numerically has been reworked using a new
z_timeout_end_calc() predicate. Also in queue.c, a (when POLL was
enabled) a similar loop was needlessly used to try to retry the
k_poll() call after a spurious failure. But k_poll() does not fail
spuriously, so the loop was removed.
Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2020-03-06 00:18:14 +01:00
|
|
|
ticks = ticks == K_TICKS_FOREVER ? MAX_TICKS : ticks;
|
2020-10-27 12:27:25 +01:00
|
|
|
ticks = CLAMP(ticks - 1, 0, (int32_t)MAX_TICKS);
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
2020-05-27 18:26:57 +02:00
|
|
|
uint64_t curr = count();
|
|
|
|
uint64_t next;
|
|
|
|
uint32_t adj, cyc = ticks * CYC_PER_TICK;
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
/* Round up to next tick boundary */
|
2020-05-27 18:26:57 +02:00
|
|
|
adj = (uint32_t)(curr - last_count) + (CYC_PER_TICK - 1);
|
2020-01-07 07:31:41 +01:00
|
|
|
if (cyc <= MAX_CYC - adj) {
|
|
|
|
cyc += adj;
|
|
|
|
} else {
|
|
|
|
cyc = MAX_CYC;
|
|
|
|
}
|
|
|
|
cyc = (cyc / CYC_PER_TICK) * CYC_PER_TICK;
|
|
|
|
next = last_count + cyc;
|
|
|
|
|
2020-05-27 18:26:57 +02:00
|
|
|
if (((uint32_t)next - (uint32_t)curr) < MIN_DELAY) {
|
2020-01-07 07:31:41 +01:00
|
|
|
next += CYC_PER_TICK;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_compare(next);
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2021-02-25 21:33:15 +01:00
|
|
|
uint32_t sys_clock_elapsed(void)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
|
|
|
if (!IS_ENABLED(CONFIG_TICKLESS_KERNEL)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
k_spinlock_key_t key = k_spin_lock(&lock);
|
2020-05-27 18:26:57 +02:00
|
|
|
uint32_t ret = (count32() - (uint32_t)last_count) / CYC_PER_TICK;
|
2020-01-07 07:31:41 +01:00
|
|
|
|
|
|
|
k_spin_unlock(&lock, key);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2021-03-12 18:46:52 +01:00
|
|
|
uint32_t sys_clock_cycle_get_32(void)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
|
|
|
return count32();
|
|
|
|
}
|
|
|
|
|
2021-10-30 02:10:35 +02:00
|
|
|
uint64_t sys_clock_cycle_get_64(void)
|
|
|
|
{
|
2021-11-14 23:27:30 +01:00
|
|
|
return count();
|
2021-10-30 02:10:35 +02:00
|
|
|
}
|
|
|
|
|
2021-12-15 22:12:50 +01:00
|
|
|
/* Interrupt setup is partially-cpu-local state, so needs to be
|
|
|
|
* repeated for each core when it starts. Note that this conforms to
|
|
|
|
* the Zephyr convention of sending timer interrupts to all cpus (for
|
|
|
|
* the benefit of timeslicing).
|
|
|
|
*/
|
|
|
|
static void irq_init(void)
|
2020-01-07 07:31:41 +01:00
|
|
|
{
|
2021-12-15 22:12:50 +01:00
|
|
|
int cpu = arch_curr_cpu()->id;
|
|
|
|
|
|
|
|
CAVS_INTCTRL[cpu].l2.clear = CAVS_L2_DWCT0;
|
2021-04-01 11:38:53 +02:00
|
|
|
irq_enable(TIMER_IRQ);
|
2020-01-07 07:31:41 +01:00
|
|
|
}
|
2021-11-04 12:51:39 +01:00
|
|
|
|
2021-12-15 22:12:50 +01:00
|
|
|
void smp_timer_init(void)
|
|
|
|
{
|
|
|
|
irq_init();
|
|
|
|
}
|
|
|
|
|
2021-11-04 12:51:39 +01:00
|
|
|
/* Runs on core 0 only */
|
|
|
|
static int sys_clock_driver_init(const struct device *dev)
|
|
|
|
{
|
|
|
|
uint64_t curr = count();
|
|
|
|
|
|
|
|
IRQ_CONNECT(TIMER_IRQ, 0, compare_isr, 0, 0);
|
|
|
|
set_compare(curr + CYC_PER_TICK);
|
|
|
|
last_count = curr;
|
2021-12-15 22:12:50 +01:00
|
|
|
irq_init();
|
2021-11-04 12:51:39 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
SYS_INIT(sys_clock_driver_init, PRE_KERNEL_2,
|
|
|
|
CONFIG_SYSTEM_CLOCK_INIT_PRIORITY);
|