From: Ciprian Marian Costea flexcan_chip_interrupts_enable() disables only the primary IRQ line while writing to the IMASK and CTRL registers. On multi-IRQ platforms (S32G2, MCF5441X), the additional IRQ lines (boff, err, secondary-mb) remain active so their handlers can fire while registers are inconsistent. Disable all registered IRQ lines around the IMASK/CTRL writes. This also fixes the resume path, which calls this function. Signed-off-by: Ciprian Marian Costea Link: https://patch.msgid.link/20260326135825.3428856-3-ciprianmarian.costea@oss.nxp.com Signed-off-by: Marc Kleine-Budde --- drivers/net/can/flexcan/flexcan-core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index f5d22c61503f..b3bb9acc5a2c 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -1430,14 +1430,28 @@ static void flexcan_chip_interrupts_enable(const struct net_device *dev) { const struct flexcan_priv *priv = netdev_priv(dev); struct flexcan_regs __iomem *regs = priv->regs; + u32 quirks = priv->devtype_data.quirks; u64 reg_imask; disable_irq(dev->irq); + if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) { + disable_irq(priv->irq_boff); + disable_irq(priv->irq_err); + } + if (quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) + disable_irq(priv->irq_secondary_mb); + priv->write(priv->reg_ctrl_default, ®s->ctrl); reg_imask = priv->rx_mask | priv->tx_mask; priv->write(upper_32_bits(reg_imask), ®s->imask2); priv->write(lower_32_bits(reg_imask), ®s->imask1); enable_irq(dev->irq); + if (quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) + enable_irq(priv->irq_secondary_mb); + if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) { + enable_irq(priv->irq_boff); + enable_irq(priv->irq_err); + } } static void flexcan_chip_interrupts_disable(const struct net_device *dev) -- 2.53.0