michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: can: mcan: notify of aborted transmission on can_stop()

Browse source 
Notify of any aborted transmission when entering init mode via can_stop().

Fixes: #50545

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
This commit is contained in:
Henrik Brix Andersen 2022-09-21 16:07:26 +02:00 • committed by Fabio Baltieri
commit 6cf34d0d33
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/can/can_mcan.c
View file

@ -257,12 +257,15 @@ int can_mcan_stop(const struct device *dev)
const struct can_mcan_config *cfg = dev->config; const struct can_mcan_config *cfg = dev->config;
struct can_mcan_data *data = dev->data; struct can_mcan_data *data = dev->data;
struct can_mcan_reg *can = cfg->can; struct can_mcan_reg *can = cfg->can;
can_tx_callback_t tx_cb;
uint32_t tx_idx;
int ret; int ret;
if (!data->started) { if (!data->started) {
return -EALREADY; return -EALREADY;
} }
/* CAN transmissions are automatically stopped when entering init mode */
ret = can_enter_init_mode(can, K_MSEC(CAN_INIT_TIMEOUT)); ret = can_enter_init_mode(can, K_MSEC(CAN_INIT_TIMEOUT));
if (ret != 0) { if (ret != 0) {
LOG_ERR("Failed to enter init mode"); LOG_ERR("Failed to enter init mode");
@ -281,6 +284,16 @@ int can_mcan_stop(const struct device *dev)
data->started = false; data->started = false;
for (tx_idx = 0; tx_idx < ARRAY_SIZE(data->tx_fin_cb); tx_idx++) {
tx_cb = data->tx_fin_cb[tx_idx];
if (tx_cb != NULL) {
data->tx_fin_cb[tx_idx] = NULL;
tx_cb(dev, -ENETDOWN, data->tx_fin_cb_arg[tx_idx]);
k_sem_give(&data->tx_sem);
}
}
return 0; return 0;
} }
@ -554,6 +567,7 @@ static void can_mcan_tc_event_handler(const struct device *dev)
k_sem_give(&data->tx_sem); k_sem_give(&data->tx_sem);
tx_cb = data->tx_fin_cb[tx_idx]; tx_cb = data->tx_fin_cb[tx_idx];
data->tx_fin_cb[tx_idx] = NULL;
tx_cb(dev, 0, data->tx_fin_cb_arg[tx_idx]); tx_cb(dev, 0, data->tx_fin_cb_arg[tx_idx]);
} }
} }