[arch][arm-m] refactor systick code into separate module
Add generic support for running systick in monotonic mode and providing current_time() routines. Platforms may choose not to use this, thus it is moved into an optional module.
This commit is contained in:
Travis Geiselbrecht
@@ -82,8 +82,8 @@ void arch_early_init(void)
|
||||
NVIC_SetPriority(SVCall_IRQn, arm_cm_lowest_priority());
|
||||
NVIC_SetPriority(PendSV_IRQn, arm_cm_lowest_priority());
|
||||
|
||||
/* initialize the systick mechanism */
|
||||
arm_cm_systick_init();
|
||||
/* set systick to medium priority */
|
||||
NVIC_SetPriority(SysTick_IRQn, arm_cm_medium_priority());
|
||||
}
|
||||
|
||||
void arch_init(void)
|
||||
|
||||
@@ -160,9 +160,7 @@ static inline void arm_cm_trigger_preempt(void)
|
||||
}
|
||||
|
||||
/* systick */
|
||||
void arm_cm_systick_init(void);
|
||||
void arm_cm_systick_set_periodic(uint32_t systick_clk_freq, lk_time_t period);
|
||||
void arm_cm_systick_cancel_periodic(void);
|
||||
void arm_cm_systick_init(uint32_t mhz);
|
||||
/* extern void _systick(void); // override this */
|
||||
|
||||
/* interrupt glue */
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Travis Geiselbrecht
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files
|
||||
* (the "Software"), to deal in the Software without restriction,
|
||||
* including without limitation the rights to use, copy, modify, merge,
|
||||
* publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
* and to permit persons to whom the Software is furnished to do so,
|
||||
* subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <debug.h>
|
||||
#include <trace.h>
|
||||
#include <kernel/thread.h>
|
||||
#include <arch/arm.h>
|
||||
#include <arch/arm/cm.h>
|
||||
|
||||
#define LOCAL_TRACE 0
|
||||
|
||||
void arm_cm_systick_init(void)
|
||||
{
|
||||
NVIC_SetPriority(SysTick_IRQn, arm_cm_medium_priority());
|
||||
}
|
||||
|
||||
void arm_cm_systick_set_periodic(uint32_t systick_clk_freq, lk_time_t period)
|
||||
{
|
||||
LTRACEF("clk_freq %u, period %u\n", systick_clk_freq, (uint)period);
|
||||
|
||||
uint32_t ticks = systick_clk_freq / (1000 / period);
|
||||
LTRACEF("ticks %d\n", ticks);
|
||||
|
||||
SysTick->LOAD = (ticks & SysTick_LOAD_RELOAD_Msk) - 1;
|
||||
SysTick->VAL = 0;
|
||||
SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_TICKINT_Msk | SysTick_CTRL_ENABLE_Msk;
|
||||
}
|
||||
|
||||
void arm_cm_systick_cancel_periodic(void)
|
||||
{
|
||||
SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
|
||||
}
|
||||
|
||||
8
arch/arm/arm-m/systick/rules.mk
Normal file
8
arch/arm/arm-m/systick/rules.mk
Normal file
@@ -0,0 +1,8 @@
|
||||
LOCAL_DIR := $(GET_LOCAL_DIR)
|
||||
|
||||
MODULE := $(LOCAL_DIR)
|
||||
|
||||
MODULE_SRCS += \
|
||||
$(LOCAL_DIR)/systick.c
|
||||
|
||||
include make/module.mk
|
||||
@@ -1,6 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Ian McKellar
|
||||
* Copyright (c) 2013 Travis Geiselbrecht
|
||||
* Copyright (c) 2012-2014 Travis Geiselbrecht
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files
|
||||
@@ -21,21 +20,29 @@
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Generic systick timer support for providing system time (current_time(), current_time_hires()),
|
||||
* and a monotonic timer for the kernel.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <debug.h>
|
||||
#include <assert.h>
|
||||
#include <trace.h>
|
||||
#include <err.h>
|
||||
#include <sys/types.h>
|
||||
#include <kernel/thread.h>
|
||||
#include <arch/arm.h>
|
||||
#include <arch/arm/cm.h>
|
||||
#include <platform.h>
|
||||
#include <platform/timer.h>
|
||||
#include <arch/arm/cm.h>
|
||||
|
||||
#include <inc/hw_types.h>
|
||||
#include "ti_driverlib.h"
|
||||
|
||||
#define LOCAL_TRACE 0
|
||||
|
||||
static volatile uint64_t ticks;
|
||||
static uint32_t tick_rate = 0;
|
||||
static uint32_t tick_rate_mhz = 0;
|
||||
static lk_time_t tick_interval_ms;
|
||||
static lk_bigtime_t tick_interval_us;
|
||||
@@ -43,12 +50,30 @@ static lk_bigtime_t tick_interval_us;
|
||||
static platform_timer_callback cb;
|
||||
static void *cb_args;
|
||||
|
||||
/* use systick as the kernel tick */
|
||||
static void arm_cm_systick_set_periodic(lk_time_t period)
|
||||
{
|
||||
LTRACEF("clk_freq %u, period %u\n", tick_rate, (uint)period);
|
||||
|
||||
uint32_t ticks = tick_rate / (1000 / period);
|
||||
LTRACEF("ticks %d\n", ticks);
|
||||
|
||||
SysTick->LOAD = (ticks & SysTick_LOAD_RELOAD_Msk) - 1;
|
||||
SysTick->VAL = 0;
|
||||
SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk | SysTick_CTRL_TICKINT_Msk | SysTick_CTRL_ENABLE_Msk;
|
||||
}
|
||||
|
||||
static void arm_cm_systick_cancel_periodic(void)
|
||||
{
|
||||
SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
|
||||
}
|
||||
|
||||
/* main systick irq handler */
|
||||
void _systick(void)
|
||||
{
|
||||
ticks++;
|
||||
|
||||
arm_cm_irq_entry();
|
||||
|
||||
ticks++;
|
||||
bool resched = false;
|
||||
if (cb) {
|
||||
lk_time_t now = current_time();
|
||||
@@ -63,6 +88,8 @@ status_t platform_set_periodic_timer(platform_timer_callback callback, void *arg
|
||||
{
|
||||
LTRACEF("callback %p, arg %p, interval %ld\n", callback, arg, interval);
|
||||
|
||||
DEBUG_ASSERT(tick_rate != 0 && tick_rate_mhz != 0);
|
||||
|
||||
enter_critical_section();
|
||||
|
||||
cb = callback;
|
||||
@@ -70,7 +97,7 @@ status_t platform_set_periodic_timer(platform_timer_callback callback, void *arg
|
||||
|
||||
tick_interval_ms = interval;
|
||||
tick_interval_us = interval * 1000;
|
||||
arm_cm_systick_set_periodic(SysCtlClockGet(), interval);
|
||||
arm_cm_systick_set_periodic(interval);
|
||||
|
||||
exit_critical_section();
|
||||
|
||||
@@ -113,23 +140,10 @@ lk_bigtime_t current_time_hires(void)
|
||||
return res;
|
||||
}
|
||||
|
||||
void stellaris_timer_early_init(void)
|
||||
void arm_cm_systick_init(uint32_t mhz)
|
||||
{
|
||||
uint32_t clock_rate = SysCtlClockGet();
|
||||
tick_rate_mhz = clock_rate / 1000000;
|
||||
|
||||
#if 0
|
||||
SysCtlPeripheralEnable(SYSCTL_PERIPH_WTIMER0);
|
||||
|
||||
/* configure the timer as a 64bit up counting tick at syslock rate */
|
||||
TimerConfigure(WTIMER0_BASE, TIMER_CFG_PERIODIC_UP);
|
||||
TimerLoadSet64(WTIMER0_BASE, ULONG_MAX);
|
||||
TimerEnable(WTIMER0_BASE, TIMER_BOTH);
|
||||
#endif
|
||||
tick_rate = mhz;
|
||||
tick_rate_mhz = mhz / 1000000;
|
||||
}
|
||||
|
||||
void stellaris_timer_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
// vim: set ts=4 sw=4 noexpandtab:
|
||||
@@ -135,8 +135,7 @@ MODULE_SRCS += \
|
||||
$(LOCAL_DIR)/arm-m/vectab.c \
|
||||
$(LOCAL_DIR)/arm-m/start.c \
|
||||
$(LOCAL_DIR)/arm-m/exceptions.c \
|
||||
$(LOCAL_DIR)/arm-m/thread.c \
|
||||
$(LOCAL_DIR)/arm-m/systick.c
|
||||
$(LOCAL_DIR)/arm-m/thread.c
|
||||
|
||||
GLOBAL_INCLUDES += \
|
||||
$(LOCAL_DIR)/arm-m/CMSIS/Include
|
||||
|
||||
Reference in New Issue
Block a user