From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A494A3C457C for ; Thu, 7 May 2026 11:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778153012; cv=none; b=AvNh3UO1p8EKYvHrXMr8wLEd1bNpU7z6Cf2HCmo7JQSB3RvuQadVrLbFYvGxulsdI6hsQNrbNOz7VLpem2HQ6WoyOH/ERjnad5/1hd585acPrOecUDI0qgWMEsJBsphSXW1IuTL3/l8YtvCe+rbUOmAcnL6KoV3BaMHylxjIFRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778153012; c=relaxed/simple; bh=cqQ3bd1BbIIz1RvSUCEvedVw8QOoXwyj7R7QNKLoSpU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T3OUqqIGRRkQilsYET8Pqtl0O7WtmN3kW+i/16HuVpNpGryhH60laGijAVphbpqaySsqo8DzA9NQ6eTaQJVeZ4V5ef0IdATEaaKq/qYs3rLp4QMCvYsGi4fQRuuNkGgawKyZF8TAEiZqGFyj6uJBnCB7Xml4kcw55dTGJ7c9aQs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1wKwp9-0002vu-Vp; Thu, 07 May 2026 13:23:23 +0200 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wKwp9-000ufp-0i; Thu, 07 May 2026 13:23:23 +0200 Received: from blackshift.org (p4ffb2dc6.dip0.t-ipconnect.de [79.251.45.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519MLKEM768 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id 6D0C553040B; Thu, 07 May 2026 11:23:23 +0000 (UTC) From: Marc Kleine-Budde To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org, kernel@pengutronix.de, Ciprian Marian Costea , Marc Kleine-Budde Subject: [PATCH net 6/6] can: flexcan: disable all IRQ lines in flexcan_chip_interrupts_enable() Date: Thu, 7 May 2026 10:22:28 +0200 Message-ID: <20260507112321.439968-7-mkl@pengutronix.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260507112321.439968-1-mkl@pengutronix.de> References: <20260507112321.439968-1-mkl@pengutronix.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org 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