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 D1F622FDC36 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=E0Oo6sHY7vuKtREMqYEfL+wCEB/EyoEgcb7ZK37OhrQkYKTFeoApgGekg0J0C1cK2R1avOdMxWCthn3EQ/1fUu+MyNjQ95ho1kEcwmcWlLkL2I82hNFB7/NjbeBsGkamJlypq35a9W3dmRk3dFRV0augdw/lHxUerR3D99Ta5oU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755020246; c=relaxed/simple; bh=T4UhMbJQzjHlRmeUxcozCrFGrTZCcp3Af50Cnn/lG1s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y4fManZqWfdOf3hOxaQvivA88t0kVWSK3+ZbVIPg3k3Q+4pXX3VFESCGIlRn5ygdft5FspQP8VRAAZVrNvsCnio1g0Fev7MHwMFUGoYMY2CG3PZtngZrctshMt3/XGIasGwpRxfrbYGzIr+Of8z7r7fd/diKpd0nSgwGizqI4bQ= 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 1ulsw6-0008FM-3B 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-00DEan-2d 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 7E352456247 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 5A2404561FC; Tue, 12 Aug 2025 17:37:17 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 9efcaaa1; Tue, 12 Aug 2025 17:37:15 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 12 Aug 2025 19:36:54 +0200 Subject: [PATCH 4/7] can: m_can: m_can_chip_config(): bring up interface in correct 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: <20250812-m_can-fix-state-handling-v1-4-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=1560; i=mkl@pengutronix.de; h=from:subject:message-id; bh=T4UhMbJQzjHlRmeUxcozCrFGrTZCcp3Af50Cnn/lG1s=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBom3vE9XhP8mkJYGc6RJIuP9hBbJEm6C1iYsAS5 +CuJIRWSKeJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaJt7xAAKCRAMdGXf+ZCR nHhjCAC0Npc9zlaTIaotl39Zyj6YGDFwikzJasFT6jvWJ7vqtFldDpnPkbM8Wvpl0sjHZjG8Vg8 qNTQ8VZRY/e/T5To5BqL96cMhFVmc6Ynxkjf4t82ecF4X0g3Fp+5tb8zuQ5xC31xNuUGDFx/LL4 dU0CzUMPEbuk4b8BFnPLi/nsa1pp7sZh35/rux9iPDsF/tCHbiiEprLn0xXIB/lcXubCGLMPtjU ojpRXSs1aKiXhOguOanQDGKpG9258CWAXRS5PZTUJXbaUl+oXWEoMhwMwowILTLZsemModM0MAb iQAou0eKRze9YBUZNdKdpzbDT+CTRqP1sTfcTWf3HI4b/H9z 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 In some SoCs (observed on the STM32MP15) the M_CAN IP core keeps the CAN state and CAN error counters over an internal reset cycle. An external reset is not always possible, due to the shared reset with the other CAN core. This caused the core not always be in Error Active state when bringing up the controller. Instead of always setting the CAN state to Error Active in m_can_chip_config(), fix this by reading and decoding the Protocol Status Regitser (PSR) and set the CAN state accordingly. Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support") Signed-off-by: Marc Kleine-Budde --- drivers/net/can/m_can/m_can.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index b485d2f3d971..310a907cbb7e 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1607,6 +1607,7 @@ static int m_can_chip_config(struct net_device *dev) static int m_can_start(struct net_device *dev) { struct m_can_classdev *cdev =3D netdev_priv(dev); + u32 reg_psr; int ret; =20 /* basic m_can configuration */ @@ -1617,7 +1618,8 @@ static int m_can_start(struct net_device *dev) netdev_queue_set_dql_min_limit(netdev_get_tx_queue(cdev->net, 0), cdev->tx_max_coalesced_frames); =20 - cdev->can.state =3D CAN_STATE_ERROR_ACTIVE; + reg_psr =3D m_can_read(cdev, M_CAN_PSR); + cdev->can.state =3D m_can_can_state_get_by_psr(reg_psr); =20 m_can_enable_all_interrupts(cdev); =20 --=20 2.50.1