commit 6cf34d0d33c8a23a7a1369a163e1fc6df2dd227d
author Henrik Brix Andersen <hebad@vestas.com> Wed Sep 21 16:07:26 2022 +0200
committer Fabio Baltieri <fabio.baltieri@gmail.com> Fri Sep 23 17:25:01 2022 +0000
tree 76208233e236f26a5fd7d23c506c2d855781fdd0
parent b8eb11de3b35ead5a331d6743460da6998a29310

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

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

Fixes: #50545

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>

drivers/can/can_mcan.c

diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c
index 716deb5..e196951 100644
--- a/drivers/can/can_mcan.c
+++ b/drivers/can/can_mcan.c
@@ -257,12 +257,15 @@
 	const struct can_mcan_config *cfg = dev->config;
 	struct can_mcan_data *data = dev->data;
 	struct can_mcan_reg *can = cfg->can;
+	can_tx_callback_t tx_cb;
+	uint32_t tx_idx;
 	int ret;
 
 	if (!data->started) {
 		return -EALREADY;
 	}
 
+	/* CAN transmissions are automatically stopped when entering init mode */
 	ret = can_enter_init_mode(can, K_MSEC(CAN_INIT_TIMEOUT));
 	if (ret != 0) {
 		LOG_ERR("Failed to enter init mode");
@@ -281,6 +284,16 @@
 
 	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;
 }
 
@@ -554,6 +567,7 @@
 		k_sem_give(&data->tx_sem);
 
 		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]);
 	}
 }