Commit a79d5510 authored by Henrik Brix Andersen's avatar Henrik Brix Andersen Committed by Henrik Brix Andersen
Browse files

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: default avatarHenrik Brix Andersen <hebad@vestas.com>
(cherry picked from commit fc078f9d)
parent 485e591f

drivers/can/can_sja1000.c

+9 −1
Changes for drivers/can/can_sja1000.c: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -59,6 +59,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;
@@ -610,7 +618,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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE