mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
can: flexcan: fix shutdown: first disable chip, then all interrupts
When shutting down the CAN interface (ifconfig canX down) during high CAN bus loads, the CAN core might hang and freeze the whole CPU. This patch fixes the shutdown sequence by first disabling the CAN core then disabling all interrupts. Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
parent
635d61a373
commit
5be93bdda6
@ -827,14 +827,16 @@ static void flexcan_chip_stop(struct net_device *dev)
|
||||
struct flexcan_regs __iomem *regs = priv->base;
|
||||
u32 reg;
|
||||
|
||||
/* Disable all interrupts */
|
||||
flexcan_write(0, ®s->imask1);
|
||||
|
||||
/* Disable + halt module */
|
||||
reg = flexcan_read(®s->mcr);
|
||||
reg |= FLEXCAN_MCR_MDIS | FLEXCAN_MCR_HALT;
|
||||
flexcan_write(reg, ®s->mcr);
|
||||
|
||||
/* Disable all interrupts */
|
||||
flexcan_write(0, ®s->imask1);
|
||||
flexcan_write(priv->reg_ctrl_default & ~FLEXCAN_CTRL_ERR_ALL,
|
||||
®s->ctrl);
|
||||
|
||||
if (priv->reg_xceiver)
|
||||
regulator_disable(priv->reg_xceiver);
|
||||
priv->can.state = CAN_STATE_STOPPED;
|
||||
|
Loading…
Reference in New Issue
Block a user