michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mcux: flexcan: fixes the race condition

Browse source 
Since the FLEXCAN_TransferSendNonBlocking() function has
read-modify-write operations on global resources, then
if interrupts are enabled and/or if there is more than
one thread with a different priority, threads with
a lower priority can overwrite global resource changes
made by higher priority threads.
Fixes #52673.

Signed-off-by: Mikhail Siomin <victorovich.01@mail.ru>
This commit is contained in:
Mikhail Siomin 2022-12-06 16:34:52 +03:00 • committed by Carles Cufí
commit d4f65e4031
1 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

59
drivers/can/can_mcux_flexcan.c
View file

@ -90,6 +90,8 @@ struct mcux_flexcan_config {
uint32_t phase_seg1; uint32_t phase_seg1;
uint32_t phase_seg2; uint32_t phase_seg2;
void (*irq_config_func)(const struct device *dev); void (*irq_config_func)(const struct device *dev);
void (*irq_enable_func)(void);
void (*irq_disable_func)(void);
const struct device *phy; const struct device *phy;
uint32_t max_bitrate; uint32_t max_bitrate;
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
@ -120,6 +122,7 @@ struct mcux_flexcan_data {
ATOMIC_DEFINE(tx_allocs, MCUX_FLEXCAN_MAX_TX); ATOMIC_DEFINE(tx_allocs, MCUX_FLEXCAN_MAX_TX);
struct k_sem tx_allocs_sem; struct k_sem tx_allocs_sem;
struct k_mutex tx_mutex;
struct mcux_flexcan_tx_callback tx_cbs[MCUX_FLEXCAN_MAX_TX]; struct mcux_flexcan_tx_callback tx_cbs[MCUX_FLEXCAN_MAX_TX];
enum can_state state; enum can_state state;
can_state_change_callback_t state_change_cb; can_state_change_callback_t state_change_cb;
@ -467,8 +470,12 @@ static int mcux_flexcan_send(const struct device *dev,
xfer.frame = &data->tx_cbs[alloc].frame; xfer.frame = &data->tx_cbs[alloc].frame;
xfer.mbIdx = ALLOC_IDX_TO_TXMB_IDX(alloc); xfer.mbIdx = ALLOC_IDX_TO_TXMB_IDX(alloc);
FLEXCAN_SetTxMbConfig(config->base, xfer.mbIdx, true); FLEXCAN_SetTxMbConfig(config->base, xfer.mbIdx, true);
k_mutex_lock(&data->tx_mutex, K_FOREVER);
config->irq_disable_func();
status = FLEXCAN_TransferSendNonBlocking(config->base, &data->handle, status = FLEXCAN_TransferSendNonBlocking(config->base, &data->handle,
&xfer); &xfer);
config->irq_enable_func();
k_mutex_unlock(&data->tx_mutex);
if (status != kStatus_Success) { if (status != kStatus_Success) {
return -EIO; return -EIO;
} }
@ -806,6 +813,7 @@ static int mcux_flexcan_init(const struct device *dev)
} }
k_mutex_init(&data->rx_mutex); k_mutex_init(&data->rx_mutex);
k_mutex_init(&data->tx_mutex);
k_sem_init(&data->tx_allocs_sem, MCUX_FLEXCAN_MAX_TX, k_sem_init(&data->tx_allocs_sem, MCUX_FLEXCAN_MAX_TX,
MCUX_FLEXCAN_MAX_TX); MCUX_FLEXCAN_MAX_TX);
@ -924,18 +932,24 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
} }
}; };
#define FLEXCAN_IRQ_CODE(id, name) \ #define FLEXCAN_IRQ_BY_IDX(node_id, prop, idx, cell) \
do { \ DT_IRQ_BY_NAME(node_id, \
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(id, name, irq), \ DT_STRING_TOKEN_BY_IDX(node_id, prop, idx), cell)
DT_INST_IRQ_BY_NAME(id, name, priority), \
mcux_flexcan_isr, \
DEVICE_DT_INST_GET(id), 0); \
irq_enable(DT_INST_IRQ_BY_NAME(id, name, irq)); \
} while (false)
#define FLEXCAN_IRQ(id, name) \ #define FLEXCAN_IRQ_ENABLE_CODE(node_id, prop, idx) \
COND_CODE_1(DT_INST_IRQ_HAS_NAME(id, name), \ irq_enable(FLEXCAN_IRQ_BY_IDX(node_id, prop, idx, irq));
(FLEXCAN_IRQ_CODE(id, name)), ())
#define FLEXCAN_IRQ_DISABLE_CODE(node_id, prop, idx) \
irq_disable(FLEXCAN_IRQ_BY_IDX(node_id, prop, idx, irq));
#define FLEXCAN_IRQ_CONFIG_CODE(node_id, prop, idx) \
do { \
IRQ_CONNECT(FLEXCAN_IRQ_BY_IDX(node_id, prop, idx, irq), \
FLEXCAN_IRQ_BY_IDX(node_id, prop, idx, priority), \
mcux_flexcan_isr, \
DEVICE_DT_GET(node_id), 0); \
FLEXCAN_IRQ_ENABLE_CODE(node_id, prop, idx); \
} while (false);
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
#define FLEXCAN_PINCTRL_DEFINE(id) PINCTRL_DT_INST_DEFINE(id); #define FLEXCAN_PINCTRL_DEFINE(id) PINCTRL_DT_INST_DEFINE(id);
@ -950,6 +964,8 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
FLEXCAN_PINCTRL_DEFINE(id) \ FLEXCAN_PINCTRL_DEFINE(id) \
\ \
static void mcux_flexcan_irq_config_##id(const struct device *dev); \ static void mcux_flexcan_irq_config_##id(const struct device *dev); \
static void mcux_flexcan_irq_enable_##id(void); \
static void mcux_flexcan_irq_disable_##id(void); \
\ \
static const struct mcux_flexcan_config mcux_flexcan_config_##id = { \ static const struct mcux_flexcan_config mcux_flexcan_config_##id = { \
.base = (CAN_Type *)DT_INST_REG_ADDR(id), \ .base = (CAN_Type *)DT_INST_REG_ADDR(id), \
@ -964,6 +980,8 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
.phase_seg2 = DT_INST_PROP_OR(id, phase_seg2, 0), \ .phase_seg2 = DT_INST_PROP_OR(id, phase_seg2, 0), \
.sample_point = DT_INST_PROP_OR(id, sample_point, 0), \ .sample_point = DT_INST_PROP_OR(id, sample_point, 0), \
.irq_config_func = mcux_flexcan_irq_config_##id, \ .irq_config_func = mcux_flexcan_irq_config_##id, \
.irq_enable_func = mcux_flexcan_irq_enable_##id, \
.irq_disable_func = mcux_flexcan_irq_disable_##id, \
.phy = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(id, phys)),\ .phy = DEVICE_DT_GET_OR_NULL(DT_INST_PHANDLE(id, phys)),\
.max_bitrate = DT_INST_CAN_TRANSCEIVER_MAX_BITRATE(id, 1000000), \ .max_bitrate = DT_INST_CAN_TRANSCEIVER_MAX_BITRATE(id, 1000000), \
FLEXCAN_PINCTRL_INIT(id) \ FLEXCAN_PINCTRL_INIT(id) \
@ -979,14 +997,17 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
\ \
static void mcux_flexcan_irq_config_##id(const struct device *dev) \ static void mcux_flexcan_irq_config_##id(const struct device *dev) \
{ \ { \
FLEXCAN_IRQ(id, rx_warning); \ DT_INST_FOREACH_PROP_ELEM(id, interrupt_names, FLEXCAN_IRQ_CONFIG_CODE); \
FLEXCAN_IRQ(id, tx_warning); \ } \
FLEXCAN_IRQ(id, bus_off); \ \
FLEXCAN_IRQ(id, warning); \ static void mcux_flexcan_irq_enable_##id(void) \
FLEXCAN_IRQ(id, error); \ { \
FLEXCAN_IRQ(id, wake_up); \ DT_INST_FOREACH_PROP_ELEM(id, interrupt_names, FLEXCAN_IRQ_ENABLE_CODE); \
FLEXCAN_IRQ(id, mb_0_15); \ } \
FLEXCAN_IRQ(id, common); \ \
static void mcux_flexcan_irq_disable_##id(void) \
{ \
DT_INST_FOREACH_PROP_ELEM(id, interrupt_names, FLEXCAN_IRQ_DISABLE_CODE); \
} }
DT_INST_FOREACH_STATUS_OKAY(FLEXCAN_DEVICE_INIT_MCUX) DT_INST_FOREACH_STATUS_OKAY(FLEXCAN_DEVICE_INIT_MCUX)