drivers: can: sja1000: do not attempt to sleep in IRQ context

The can_sja1000_handle_error_warning_irq() function should only attempt to start bus-off recovery, but not wait for the result. Fixes: #63712 Signed-off-by: Henrik Brix Andersen <[email protected]>
zephyrproject-rtos · Oct 9, 2023 · fc078f9 · fc078f9
1 parent f09b67b
commit fc078f9
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/drivers/can/can_sja1000.c b/drivers/can/can_sja1000.c
@@ -53,6 +53,14 @@ static inline int can_sja1000_enter_reset_mode(const struct device *dev)
 	return 0;
 }
 
+static inline void can_sja1000_leave_reset_mode_nowait(const struct device *dev)
+{
+	uint8_t mod;
+
+	mod = can_sja1000_read_reg(dev, CAN_SJA1000_MOD);
+	can_sja1000_write_reg(dev, CAN_SJA1000_MOD, mod & ~(CAN_SJA1000_MOD_RM));
+}
+
 static inline int can_sja1000_leave_reset_mode(const struct device *dev)
 {
 	int retries = CAN_SJA1000_RESET_MODE_RETRIES;
@@ -590,7 +598,7 @@ static void can_sja1000_handle_error_warning_irq(const struct device *dev)
 		can_sja1000_tx_done(dev, -ENETUNREACH);
 #ifdef CONFIG_CAN_AUTO_BUS_OFF_RECOVERY
 		if (data->started) {
-			(void)can_sja1000_leave_reset_mode(dev);
+			can_sja1000_leave_reset_mode_nowait(dev);
 		}
 #endif /* CONFIG_CAN_AUTO_BUS_OFF_RECOVERY */
 	} else if ((sr & CAN_SJA1000_SR_ES) != 0) {