From nobody Sat Oct 4 22:35:27 2025 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 D36CB2FDC3C for ; Tue, 12 Aug 2025 17:37:23 +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=1755020246; cv=none; b=p7M52tdGVrBq+Cn+KFGvEYUabHeT0d8YtUAwWa7/FV7qNgS4nzcnmLbxiTWdiVEpMmvA7RyEhIB3Wd8hHlHX/J+symN4GI3+4XmIyZV0gGR65Qap8QqXivyYnjL+x9K81JxY9wA8+LyirS8ls2/29Zj6fRJ49TBQf3wDOmlRf0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755020246; c=relaxed/simple; bh=TCD8jGdv4Nc/9HzPm+XD/Qj5PPIOwkt4iWL2Yi8+gMY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eQ60rVCcQspcqiUcUntTSD7g6drJjablxowhpC1a0D8KdeHZ8WdSPq83LRfLoiRXPwXCf7g1jOb8+uGSTVMN6mGWWASRFv96LZYQrIrMLDV2ADVqlffXC1GSqCKNvW0EtQ/UfLFV9/CvDWZynLXVwtW/HboJn8aTZh/Jl38vjxw= 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 1ulsw5-0008F2-WA for linux-kernel@vger.kernel.org; Tue, 12 Aug 2025 19:37:22 +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 1ulsw4-00DEaY-2M for linux-kernel@vger.kernel.org; Tue, 12 Aug 2025 19:37:20 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 5B0C0456243 for ; Tue, 12 Aug 2025 17:37:20 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (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) by bjornoya.blackshift.org (Postfix) with ESMTPS id 3903D4561F9; Tue, 12 Aug 2025 17:37:17 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id d7f62ba5; Tue, 12 Aug 2025 17:37:15 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 12 Aug 2025 19:36:53 +0200 Subject: [PATCH 3/7] can: m_can: m_can_handle_state_errors(): fix CAN state transition to Error Active 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: <20250812-m_can-fix-state-handling-v1-3-b739e06c0a3b@pengutronix.de> References: <20250812-m_can-fix-state-handling-v1-0-b739e06c0a3b@pengutronix.de> In-Reply-To: <20250812-m_can-fix-state-handling-v1-0-b739e06c0a3b@pengutronix.de> To: Chandrasekar Ramakrishnan , Vincent Mailhol , Patrik Flykt , Dong Aisheng , Fengguang Wu , Varka Bhadram , Wu Bo , Markus Schneider-Pargmann , Philipp Zabel Cc: linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde X-Mailer: b4 0.15-dev-e44bb X-Developer-Signature: v=1; a=openpgp-sha256; l=3308; i=mkl@pengutronix.de; h=from:subject:message-id; bh=TCD8jGdv4Nc/9HzPm+XD/Qj5PPIOwkt4iWL2Yi8+gMY=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBom3vCLOJL1Q+1fbX9qPxVmTwz+3kT5uTwqXss9 MJ+MkcfIrCJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaJt7wgAKCRAMdGXf+ZCR nFVdCAC3XUXdHgHMvVncs6lpmFjy+bpx4y73RuKMBMaXfWDpo9ruWiZ6GGfXwocAIsCD4Zq5Ei6 bRdSmpNniJ2Y0thZpgtj1n1lNGAnXWx5YbOEn6VnUK9NGoDpWBo61Rq2QEBnNbFnVGw0YpRbC6w Y9KBXgrcxLKLR8UnjF7VAiiihwSbyE7nsKOsX4XmoYAR4TUWyM2EjZ4zBcJuEEnF6eEC6wpPHzr 4xEtiYIxnMvijiMFkMax8wWc12iSBAkYuJaaoqpqqZqp4b8c2se0MsPUoMYgaXaIfU7Et1/5VBQ qwMFXbEgWHghtMvbr1A7c/L5bORdUTs8zbPFkJJzH92P8qxp 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 The CAN Error State is determined by the receive and transmit error counters. The CAN error counters decrease when reception/transmission is successful, so that a status transition back to the Error Active status is possible. This transition is not handled by m_can_handle_state_errors(). Add the missing detection of the Error Active state to m_can_handle_state_errors() and extend the handling of this state in m_can_handle_state_change(). Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support") Fixes: cd0d83eab2e0 ("can: m_can: m_can_handle_state_change(): fix state ch= ange") Signed-off-by: Marc Kleine-Budde --- drivers/net/can/m_can/m_can.c | 48 ++++++++++++++++++++++++++-------------= ---- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index a51dc0bb8124..b485d2f3d971 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -812,6 +812,10 @@ static int m_can_handle_state_change(struct net_device= *dev, u32 timestamp =3D 0; =20 switch (new_state) { + case CAN_STATE_ERROR_ACTIVE: + /* error active state */ + cdev->can.state =3D CAN_STATE_ERROR_ACTIVE; + break; case CAN_STATE_ERROR_WARNING: /* error warning state */ cdev->can.can_stats.error_warning++; @@ -841,6 +845,13 @@ static int m_can_handle_state_change(struct net_device= *dev, __m_can_get_berr_counter(dev, &bec); =20 switch (new_state) { + case CAN_STATE_ERROR_ACTIVE: + /* error active state */ + cf->can_id |=3D CAN_ERR_CRTL | CAN_ERR_CNT; + cf->data[1] =3D CAN_ERR_CRTL_ACTIVE; + cf->data[6] =3D bec.txerr; + cf->data[7] =3D bec.rxerr; + break; case CAN_STATE_ERROR_WARNING: /* error warning state */ cf->can_id |=3D CAN_ERR_CRTL | CAN_ERR_CNT; @@ -877,30 +888,29 @@ static int m_can_handle_state_change(struct net_devic= e *dev, return 1; } =20 +static enum can_state +m_can_can_state_get_by_psr(const u32 psr) +{ + if (psr & PSR_BO) + return CAN_STATE_BUS_OFF; + if (psr & PSR_EP) + return CAN_STATE_ERROR_PASSIVE; + if (psr & PSR_EW) + return CAN_STATE_ERROR_WARNING; + + return CAN_STATE_ERROR_ACTIVE; +} + static int m_can_handle_state_errors(struct net_device *dev, u32 psr) { struct m_can_classdev *cdev =3D netdev_priv(dev); - int work_done =3D 0; + enum can_state new_state; =20 - if (psr & PSR_EW && cdev->can.state !=3D CAN_STATE_ERROR_WARNING) { - netdev_dbg(dev, "entered error warning state\n"); - work_done +=3D m_can_handle_state_change(dev, - CAN_STATE_ERROR_WARNING); - } + new_state =3D m_can_can_state_get_by_psr(psr); + if (new_state =3D=3D cdev->can.state) + return 0; =20 - if (psr & PSR_EP && cdev->can.state !=3D CAN_STATE_ERROR_PASSIVE) { - netdev_dbg(dev, "entered error passive state\n"); - work_done +=3D m_can_handle_state_change(dev, - CAN_STATE_ERROR_PASSIVE); - } - - if (psr & PSR_BO && cdev->can.state !=3D CAN_STATE_BUS_OFF) { - netdev_dbg(dev, "entered error bus off state\n"); - work_done +=3D m_can_handle_state_change(dev, - CAN_STATE_BUS_OFF); - } - - return work_done; + return m_can_handle_state_change(dev, new_state); } =20 static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus) --=20 2.50.1