From nobody Tue Feb 10 13:17:58 2026 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 C6CE832F76D for ; Fri, 23 Jan 2026 10:16:44 +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=1769163406; cv=none; b=BLdQCmgHlijMiySjNn7I+Z0hrU5yJSdcqqyRZZYpjqGUGyO60nWsFvtGxLFnXy2D3UY5Hrg1ZTRjDC8VVdBR9VmcnpiAdRcuKB80m/Yws/dceIsAGcqE4NxcD3D1GdIWC9rorQ6IEbcxTqczsIw1yGi/xkU8YwagOVW8p58oLb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769163406; c=relaxed/simple; bh=4z9Kc93tDy77NwvWNfEjS87hBCmsuyT2VGrNeKsdaX4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mLCJp8KX3PsONleloklXbL0dWHueYgOkdxlp+37B1i1txBMe1TQHRgqWufVAurBIXLNlnYBz48g3qROuSuyyndXvhmut7MJqU2nFx/RNHj1lt8vJmT+Q1tAH56Btsz2IbbxfRkWpX7AFvQLLogDE04DSIrp3l2Kypnau7a4vnhI= 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 1vjEDX-0006FY-4L; Fri, 23 Jan 2026 11:16:39 +0100 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 1vjEDX-0024im-1Z; Fri, 23 Jan 2026 11:16:38 +0100 Received: from hardanger.blackshift.org (p54b152ce.dip0.t-ipconnect.de [84.177.82.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 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 8BD234D6BCA; Fri, 23 Jan 2026 10:16:38 +0000 (UTC) From: Marc Kleine-Budde Date: Fri, 23 Jan 2026 11:16:27 +0100 Subject: [PATCH can-next v2 2/2] can: sja1000: sja1000_err(): use error counter for error state Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260123-sja1000-state-handling-v2-2-687498087dad@pengutronix.de> References: <20260123-sja1000-state-handling-v2-0-687498087dad@pengutronix.de> In-Reply-To: <20260123-sja1000-state-handling-v2-0-687498087dad@pengutronix.de> To: Vincent Mailhol , Michael Tretter Cc: Achim Baumgartner , linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde X-Mailer: b4 0.15-dev-47773 X-Developer-Signature: v=1; a=openpgp-sha256; l=3135; i=mkl@pengutronix.de; h=from:subject:message-id; bh=ImZFcNkcBPF5WEhj9ZujZuMZIsIki8wX0jgf5Z+4H6A=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBpc0qCXcYCmDtunKgyl81v9UjLjxQ020jMfzofZ BBa8OSAeimJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaXNKggAKCRAMdGXf+ZCR nHywB/4uywdtpquiA06CIYvCkjnZQmMtG3aGrEF7juQGSh0RmdiXdkGVitHMu9etJNp3LUIKRdp DyK7peFjwQyw1llSO2jDYly4iSsiWPZyqOM91Iag5WafhlPHEGfRbMIxT9ZillIo+ads/SarzSc or/n60xdAhw1q/zKTaSXCk+PVQ2Q2/TDB6Mwv1knszaxpACnYA0kfB62h7HJ2+JNedcoevh2t1c kefAdHNIm+s3YgNKu/fMrWaO+PUKupLtodzk2/uTiUXRoOg7RfFam6JI79rbs0KixQ548ZXwrh5 UDQD0zdkQqImaZuj3Z3JDGDOeeDmvQINfJJ5P34kriANB+Zz X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 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: linux-kernel@vger.kernel.org From: Michael Tretter The CAN controller sends the EPI interrupt whenever it reaches the error passive status or enters the error active status from the error passive status. Instead of keeping track of the controller status in the driver, read the txerr and rxerr counters and use can_state_get_by_berr_counter() to determine the state of the CAN controller. Suggested-by: Achim Baumgartner Signed-off-by: Michael Tretter Signed-off-by: Marc Kleine-Budde --- drivers/net/can/sja1000/sja1000.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sj= a1000.c index ae3244b63b65..67fccc15ed20 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -407,10 +407,9 @@ static int sja1000_err(struct net_device *dev, uint8_t= isrc, uint8_t status) { struct sja1000_priv *priv =3D netdev_priv(dev); struct net_device_stats *stats =3D &dev->stats; + enum can_state state, rx_state, tx_state; struct can_frame *cf; struct sk_buff *skb; - enum can_state state =3D priv->can.state; - enum can_state rx_state, tx_state; struct can_berr_counter bec; uint8_t ecc, alc; int ret =3D 0; @@ -418,6 +417,12 @@ static int sja1000_err(struct net_device *dev, uint8_t= isrc, uint8_t status) skb =3D alloc_can_err_skb(dev, &cf); =20 sja1000_get_berr_counter(dev, &bec); + can_state_get_by_berr_counter(dev, &bec, &tx_state, &rx_state); + + if (status & SR_BS) + rx_state =3D CAN_STATE_BUS_OFF; + + state =3D max(tx_state, rx_state); =20 if (isrc & IRQ_DOI) { /* data overrun interrupt */ @@ -440,18 +445,6 @@ static int sja1000_err(struct net_device *dev, uint8_t= isrc, uint8_t status) if (priv->flags & SJA1000_QUIRK_RESET_ON_OVERRUN) ret =3D IRQ_WAKE_THREAD; } - - if (isrc & IRQ_EI) { - /* error warning interrupt */ - netdev_dbg(dev, "error warning interrupt\n"); - - if (status & SR_BS) - state =3D CAN_STATE_BUS_OFF; - else if (status & SR_ES) - state =3D CAN_STATE_ERROR_WARNING; - else - state =3D CAN_STATE_ERROR_ACTIVE; - } if (state !=3D CAN_STATE_BUS_OFF && skb) { cf->can_id |=3D CAN_ERR_CNT; cf->data[6] =3D bec.txerr; @@ -493,15 +486,6 @@ static int sja1000_err(struct net_device *dev, uint8_t= isrc, uint8_t status) stats->rx_errors++; } } - if (isrc & IRQ_EPI) { - /* error passive interrupt */ - netdev_dbg(dev, "error passive interrupt\n"); - - if (state =3D=3D CAN_STATE_ERROR_PASSIVE) - state =3D CAN_STATE_ERROR_WARNING; - else - state =3D CAN_STATE_ERROR_PASSIVE; - } if (isrc & IRQ_ALI) { /* arbitration lost interrupt */ netdev_dbg(dev, "arbitration lost interrupt\n"); @@ -514,9 +498,6 @@ static int sja1000_err(struct net_device *dev, uint8_t = isrc, uint8_t status) } =20 if (state !=3D priv->can.state) { - tx_state =3D bec.txerr >=3D bec.rxerr ? state : 0; - rx_state =3D bec.txerr <=3D bec.rxerr ? state : 0; - can_change_state(dev, cf, tx_state, rx_state); =20 if(state =3D=3D CAN_STATE_BUS_OFF) --=20 2.51.0