From nobody Thu Oct 2 23:50:49 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 9EDDE35CEAC for ; Tue, 9 Sep 2025 17:53:49 +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=1757440431; cv=none; b=aVUFCtCVfNQzJpTpKzZxOYZUI6FePxK0APVhGMr/avdOC/FLQX2d80XWA53lwnFfEw3aH6RD9HQS0pyJW3NhIPLhxk3OqehA+R5+p+4zu/l4eypJX/o55BNsN983QdeLuoj5+xtOtKStzCF9UygxQGNiWh9j+xwwk+BBGr7HbuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757440431; c=relaxed/simple; bh=0DCy0h2XRBbTxTpmizsFrnggyynTrIDS9ENByKnkhQc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RouxUTSnq3wrefxAUqlMrNAQDTB0iee5ZuWSHgqP3hnlWab1vfjCqTpDqXwo7DkHXNY79yGZcIFLvXORmoZxP/at3Xj2Fgj0xFBW3SduJgI0ZxJgjtDKwU+XZX3HXl9TbmzIzzOSeW/DMCP2YoQrpdDexbu5NCbyvxRk6t1/8Ps= 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 1uw2XL-0006rz-UM for linux-kernel@vger.kernel.org; Tue, 09 Sep 2025 19:53:47 +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 1uw2XL-000SeH-03 for linux-kernel@vger.kernel.org; Tue, 09 Sep 2025 19:53:47 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id A854F46A3FB for ; Tue, 09 Sep 2025 17:53:46 +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 852A746A3A2; Tue, 09 Sep 2025 17:53:41 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id e81b249f; Tue, 9 Sep 2025 17:53:40 +0000 (UTC) From: Marc Kleine-Budde Date: Tue, 09 Sep 2025 19:53:21 +0200 Subject: [PATCH v2 5/7] can: m_can: fix CAN state in system PM 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: <20250909-m_can-fix-state-handling-v2-5-af9fa240b68a@pengutronix.de> References: <20250909-m_can-fix-state-handling-v2-0-af9fa240b68a@pengutronix.de> In-Reply-To: <20250909-m_can-fix-state-handling-v2-0-af9fa240b68a@pengutronix.de> To: Chandrasekar Ramakrishnan , Vincent Mailhol , Patrik Flykt , Dong Aisheng , 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=1835; i=mkl@pengutronix.de; h=from:subject:message-id; bh=0DCy0h2XRBbTxTpmizsFrnggyynTrIDS9ENByKnkhQc=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBowGmeZlgR7KN2oD0diDYNYqE5veMQTxATWSTD3 8HoRHK5/oeJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaMBpngAKCRAMdGXf+ZCR nCmPB/4tgxdJETO0GHCmVoxsvOpebWsASoTyt+MWoVMEE2yZgMO29eOKFKiAugVscoB7fLFj0Vy LUoNyykf2snOeK84zg0CZIzR4xIEZJ3KSwI6RKQU0X2984THXyuqTSxEbp0UCDS2edmtb+YTJ0O F8ufBxKHqbil+aN9GMv8Cm3Yw9lCGNCaUt0ojQrsDLUPfelP3HMQd0YUvfqHUFX1Lhvn+Ex9OHJ VyU21Zag/ErrAOFBgLlrWQ/i5wGJ7T7aHWCJh8+TPvyRPYMMVLiAGwLoJ1M6SUnvbNEwCyW8Zr8 fdzQOYdaQZ63jRHHrPGydRCmFb9KAkjjvi3T1mbsvNtpQPGj 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 A suspend/resume cycle on a down interface results in the interface coming up in Error Active state. A suspend/resume cycle on an Up interface will always result in Error Active state, regardless of the actual CAN state. During suspend, only set running interfaces to CAN_STATE_SLEEPING. During resume only touch the CAN state of running interfaces. For wakeup sources, set the CAN state depending on the Protocol Status Regitser (PSR), for non wakeup source interfaces m_can_start() will do the same. Fixes: e0d1f4816f2a ("can: m_can: add Bosch M_CAN controller support") Reviewed-by: Markus Schneider-Pargmann Signed-off-by: Marc Kleine-Budde --- drivers/net/can/m_can/m_can.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index efd9c23edd4a..d44e348f2417 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -2508,12 +2508,11 @@ int m_can_class_suspend(struct device *dev) } =20 m_can_clk_stop(cdev); + cdev->can.state =3D CAN_STATE_SLEEPING; } =20 pinctrl_pm_select_sleep_state(dev); =20 - cdev->can.state =3D CAN_STATE_SLEEPING; - return ret; } EXPORT_SYMBOL_GPL(m_can_class_suspend); @@ -2526,8 +2525,6 @@ int m_can_class_resume(struct device *dev) =20 pinctrl_pm_select_default_state(dev); =20 - cdev->can.state =3D CAN_STATE_ERROR_ACTIVE; - if (netif_running(ndev)) { ret =3D m_can_clk_start(cdev); if (ret) @@ -2545,6 +2542,8 @@ int m_can_class_resume(struct device *dev) if (cdev->ops->init) ret =3D cdev->ops->init(cdev); =20 + cdev->can.state =3D m_can_state_get_by_psr(cdev); + m_can_write(cdev, M_CAN_IE, cdev->active_interrupts); } else { ret =3D m_can_start(ndev); --=20 2.51.0