Skip to content

[Backport v3.3-branch] drivers: can: sja1000: do not attempt to sleep in IRQ context #63717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2023
Merged

[Backport v3.3-branch] drivers: can: sja1000: do not attempt to sleep in IRQ context #63717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion drivers/can/can_sja1000.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down