From nobody Tue Feb 10 11:15:52 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 C6C39309DCB 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=Vhcx0T4qq9hKAEybrM2+nIOh3fg80Tiv/BCXPOeZlVrVtOvB8otfyZgLmn7JzqD2xm5UjJDqhId9LZxFVo1oOu1qB1lV5rJPnlxZI/xKTuWQu+LoWnZ98W5IDTLD52N+aF14416kqS/bFUf2Yk8dz+3ntpuqH+PK0TR8jCYzbVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769163406; c=relaxed/simple; bh=sSs60YgQd07lmmx5wE4IWKvfl1tMDMVLLadVL6NYN8Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oLy/4zmWmpYruaXTuRhnekzbJmk8Nebx3x1kT8t7y4LCy+c68uiCKizpqryf3uxdHBO/DMocXhISWZQ74T5T8L1tQldLoEdmjA5/KLeR878uRwQu04P0iC8mtIb4wW8MQ2LbcOlesoJF40994Q307y1mmRzgQDe2rvLxBmIIBkg= 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-0006FX-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-0024il-1I; 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 8247F4D6BC9; Fri, 23 Jan 2026 10:16:38 +0000 (UTC) From: Marc Kleine-Budde Date: Fri, 23 Jan 2026 11:16:26 +0100 Subject: [PATCH can-next v2 1/2] can: sja1000: sja1000_err(): make use of sja1000_get_berr_counter() to read error counters 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-1-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=1905; i=mkl@pengutronix.de; h=from:subject:message-id; bh=sSs60YgQd07lmmx5wE4IWKvfl1tMDMVLLadVL6NYN8Y=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBpc0p/IYCFPH9YYIW6FL+6adLpgoLWpouoRbURh kv/EDjb19CJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaXNKfwAKCRAMdGXf+ZCR nDxPCAC3hkiN9C5o6PC7tE4DGciSjdJ2wI66MHYUJCzeuivusXa3kY5Ri9HQ/q6I0HIrGBO42J0 mDpTj/qiTwEpokiov2r3EzC8RQ9KJui0LfI+wnm2nwRsONG8QzPpiGqats8JGMH/i4lollHiy0c u8kloW/aBKEmNWBgizO91BP1ggHO/yIauJdSmYGGmEw2OVk0qMcxKJf8zpQqyVzEL7pNgbQSB+/ LAFx5Rc91NZpwwOb7VfuxjP3Y0IvrI+t2TrZh0TAwPUKjT4K+nzPeHiHj7HCKkh0O6yWF8B6/Vl 9g4J9WUwIQof8Uyh4atCnubTKvpfQgdAOT9B4ILti62H/Q7S 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 This is a preparation patch to make use of can_state_get_by_berr_counter() which works on a struct can_berr_counter. Reuse the existing function sja1000_get_berr_counter() to read the error counters into a struct can_berr_counter. Signed-off-by: Marc Kleine-Budde Reviewed-by: Michael Tretter --- drivers/net/can/sja1000/sja1000.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sj= a1000.c index a8fa0d6516b9..ae3244b63b65 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c @@ -411,14 +411,13 @@ static int sja1000_err(struct net_device *dev, uint8_= t isrc, uint8_t status) struct sk_buff *skb; enum can_state state =3D priv->can.state; enum can_state rx_state, tx_state; - unsigned int rxerr, txerr; + struct can_berr_counter bec; uint8_t ecc, alc; int ret =3D 0; =20 skb =3D alloc_can_err_skb(dev, &cf); =20 - txerr =3D priv->read_reg(priv, SJA1000_TXERR); - rxerr =3D priv->read_reg(priv, SJA1000_RXERR); + sja1000_get_berr_counter(dev, &bec); =20 if (isrc & IRQ_DOI) { /* data overrun interrupt */ @@ -455,8 +454,8 @@ static int sja1000_err(struct net_device *dev, uint8_t = isrc, uint8_t status) } if (state !=3D CAN_STATE_BUS_OFF && skb) { cf->can_id |=3D CAN_ERR_CNT; - cf->data[6] =3D txerr; - cf->data[7] =3D rxerr; + cf->data[6] =3D bec.txerr; + cf->data[7] =3D bec.rxerr; } if (isrc & IRQ_BEI) { /* bus error interrupt */ @@ -515,8 +514,8 @@ static int sja1000_err(struct net_device *dev, uint8_t = isrc, uint8_t status) } =20 if (state !=3D priv->can.state) { - tx_state =3D txerr >=3D rxerr ? state : 0; - rx_state =3D txerr <=3D rxerr ? state : 0; + tx_state =3D bec.txerr >=3D bec.rxerr ? state : 0; + rx_state =3D bec.txerr <=3D bec.rxerr ? state : 0; =20 can_change_state(dev, cf, tx_state, rx_state); =20 --=20 2.51.0