adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 8

drivers: counter: Reset timer using RCC before initialization

Browse source 
In multi-image environment, after jump to the image we can have running
timer with interrupts enabled. If interrupt is triggered, the asserts
in the driver can cause a crash.

This patch also adds 'resets' property for all timer nodes.

Signed-off-by: Patryk Duda <pdk@semihalf.com>
This commit is contained in:
Patryk Duda 2022-10-28 13:41:39 +02:00 committed by Marti Bolivar
parent 015a21032e
commit 227ac76828
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/counter/Kconfig.stm32_timer
View file

@ -6,5 +6,6 @@ config COUNTER_TIMER_STM32
default y
depends on DT_HAS_ST_STM32_COUNTER_ENABLED
select USE_STM32_LL_TIM
select RESET
help
Enable the counter driver for STM32 family of processors.

15
drivers/counter/counter_ll_stm32_timer.c
View file

@ -8,6 +8,7 @@
#include <zephyr/drivers/counter.h>
#include <zephyr/drivers/clock_control/stm32_clock_control.h>
#include <zephyr/drivers/reset.h>
#include <zephyr/irq.h>
#include <zephyr/sys/atomic.h>
@ -86,6 +87,8 @@ struct counter_stm32_data {
uint32_t guard_period;
atomic_t cc_int_pending;
uint32_t freq;
/* Reset controller device configuration */
const struct reset_dt_spec reset;
};
struct counter_stm32_ch_data {
@ -473,6 +476,14 @@ static int counter_stm32_init_timer(const struct device *dev)
}
data->freq = tim_clk / (cfg->prescaler + 1U);
if (!device_is_ready(data->reset.dev)) {
LOG_ERR("reset controller not ready");
return -ENODEV;
}
/* Reset timer to default state using RCC */
reset_line_toggle_dt(&data->reset);
/* config/enable IRQ */
cfg->irq_config_func(dev);
@ -617,7 +628,9 @@ void counter_stm32_irq_handler(const struct device *dev)
BUILD_ASSERT(NUM_CH(TIM(idx)) <= TIMER_MAX_CH, \
"TIMER too many channels"); \
\
static struct counter_stm32_data counter##idx##_data; \
static struct counter_stm32_data counter##idx##_data = { \
.reset = RESET_DT_SPEC_GET(TIMER(idx)), \
}; \
static struct counter_stm32_ch_data counter##idx##_ch_data[TIMER_MAX_CH]; \
\
static void counter_##idx##_stm32_irq_config(const struct device *dev) \