From nobody Thu Dec 18 08:34:50 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 217128063C for ; Fri, 28 Jun 2024 21:41:25 +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=1719610888; cv=none; b=NeChfQT7y6JihUOXiabgc0UQUl1W2LATfGQlol7RnwJpYg63TivXFtmQM2XGr9QtoBGGpbnKf4tjr3DFoL3tBRiUx+/ZegUX1D8mqg7sIpdLbpTIRLs5s4fwqxy+JQpW7aq6u0thyYHV0H79wWzllCy/Cw0UpaYzXdgGiKHaq7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719610888; c=relaxed/simple; bh=3ERqLNYToZW/irGHvQDuN9mqEakhL0aGK/uhvSVz2tY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pHxobU44MqMMqGegt2BSwWthx2YUW4x2koswtouRETmdLBTNODeYvsBwJ5LB73xmDKouOOz19j1gg/DaxuOf3WEX/ppJd5OMqmMWtCyarr+/+Kjvb6/ESQ6vBi8EhstS+zF0FlLjiAzjdNEDr7ip6NiliFVm3oCHx1JHxVmQEmI= 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 1sNJLQ-0001cG-39 for linux-kernel@vger.kernel.org; Fri, 28 Jun 2024 23:41:24 +0200 Received: from [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.94.2) (envelope-from ) id 1sNJLN-005h3z-KE for linux-kernel@vger.kernel.org; Fri, 28 Jun 2024 23:41:21 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 4D8B72F60C0 for ; Fri, 28 Jun 2024 21:41:21 +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 0CE4D2F607A; Fri, 28 Jun 2024 21:41:18 +0000 (UTC) Received: from [10.11.86.119] (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 51606c92; Fri, 28 Jun 2024 21:41:15 +0000 (UTC) From: Marc Kleine-Budde Date: Fri, 28 Jun 2024 23:40:27 +0200 Subject: [PATCH v4 3/9] can: mcp251xfd: move mcp251xfd_timestamp_start()/stop() into mcp251xfd_chip_start/stop() 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: <20240628-mcp251xfd-workaround-erratum-6-v4-3-53586f168524@pengutronix.de> References: <20240628-mcp251xfd-workaround-erratum-6-v4-0-53586f168524@pengutronix.de> In-Reply-To: <20240628-mcp251xfd-workaround-erratum-6-v4-0-53586f168524@pengutronix.de> To: Manivannan Sadhasivam , Vincent Mailhol , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Manivannan Sadhasivam , Thomas Kopp , =?utf-8?q?Stefan_Alth=C3=B6fer?= , kernel@pengutronix.de, linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Kleine-Budde X-Mailer: b4 0.15-dev-13183 X-Developer-Signature: v=1; a=openpgp-sha256; l=4137; i=mkl@pengutronix.de; h=from:subject:message-id; bh=3ERqLNYToZW/irGHvQDuN9mqEakhL0aGK/uhvSVz2tY=; b=owEBbQGS/pANAwAKASg4oj56LbxvAcsmYgBmfy3w1ZURpseFKKrwtwMyzG1h+0Lf49WrUpsmG FVOXzsVH06JATMEAAEKAB0WIQRQQLqG4LYE3Sm8Pl8oOKI+ei28bwUCZn8t8AAKCRAoOKI+ei28 b7NHB/4g3RTHjF/akzJabIvpuuqPmJDQDu6YlSsCL2KOZQd2VoSa7ofxHoouNQU17hNbOlWLCIy j8PXZ9EthkXyuFUWk5xGLUzllsbik/9cJU4SG8dNOA3m2TT/WVmp7q192iogSo0GLGwOV//H3OU iNk2EbgLeiln6FrVl7lhUurgFTpG5qFe74kUV7M4m4xfFL1Zt7FC/UKigDj+X1F95Exz1Hd5fr6 Jf42xZ/YzinUrE7REXtiAIius/ebidMTZCUYX76Y+bUhNVXqRBQh/zOeLg2PyU3cKcz0WsvO63S yE+r43drLm+XqtX0gNp+IAaZX7sDP9zdnD90x0fmopufRPa7 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 mcp251xfd wakes up from Low Power or Sleep Mode when SPI activity is detected. To avoid this, make sure that the timestamp worker is stopped before shutting down the chip. Split the starting of the timestamp worker out of mcp251xfd_timestamp_init() into the separate function mcp251xfd_timestamp_start(). Call mcp251xfd_timestamp_init() before mcp251xfd_chip_start(), move mcp251xfd_timestamp_start() to mcp251xfd_chip_start(). In this way, mcp251xfd_timestamp_stop() can be called unconditionally by mcp251xfd_chip_stop(). Signed-off-by: Marc Kleine-Budde --- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 8 +++++--- drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 7 +++++-- drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/c= an/spi/mcp251xfd/mcp251xfd-core.c index ce1610f240a4..e8e11c32cfda 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -744,6 +744,7 @@ static void mcp251xfd_chip_stop(struct mcp251xfd_priv *= priv, =20 mcp251xfd_chip_interrupts_disable(priv); mcp251xfd_chip_rx_int_disable(priv); + mcp251xfd_timestamp_stop(priv); mcp251xfd_chip_sleep(priv); } =20 @@ -763,6 +764,8 @@ static int mcp251xfd_chip_start(struct mcp251xfd_priv *= priv) if (err) goto out_chip_stop; =20 + mcp251xfd_timestamp_start(priv); + err =3D mcp251xfd_set_bittiming(priv); if (err) goto out_chip_stop; @@ -1611,11 +1614,12 @@ static int mcp251xfd_open(struct net_device *ndev) if (err) goto out_mcp251xfd_ring_free; =20 + mcp251xfd_timestamp_init(priv); + err =3D mcp251xfd_chip_start(priv); if (err) goto out_transceiver_disable; =20 - mcp251xfd_timestamp_init(priv); clear_bit(MCP251XFD_FLAGS_DOWN, priv->flags); can_rx_offload_enable(&priv->offload); =20 @@ -1649,7 +1653,6 @@ static int mcp251xfd_open(struct net_device *ndev) out_can_rx_offload_disable: can_rx_offload_disable(&priv->offload); set_bit(MCP251XFD_FLAGS_DOWN, priv->flags); - mcp251xfd_timestamp_stop(priv); out_transceiver_disable: mcp251xfd_transceiver_disable(priv); out_mcp251xfd_ring_free: @@ -1675,7 +1678,6 @@ static int mcp251xfd_stop(struct net_device *ndev) free_irq(ndev->irq, priv); destroy_workqueue(priv->wq); can_rx_offload_disable(&priv->offload); - mcp251xfd_timestamp_stop(priv); mcp251xfd_chip_stop(priv, CAN_STATE_STOPPED); mcp251xfd_transceiver_disable(priv); mcp251xfd_ring_free(priv); diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c b/drivers/= net/can/spi/mcp251xfd/mcp251xfd-timestamp.c index 712e09186987..7bbf4603038b 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c @@ -58,9 +58,12 @@ void mcp251xfd_timestamp_init(struct mcp251xfd_priv *pri= v) cc->shift =3D 1; cc->mult =3D clocksource_hz2mult(priv->can.clock.freq, cc->shift); =20 - timecounter_init(&priv->tc, &priv->cc, ktime_get_real_ns()); - INIT_DELAYED_WORK(&priv->timestamp, mcp251xfd_timestamp_work); +} + +void mcp251xfd_timestamp_start(struct mcp251xfd_priv *priv) +{ + timecounter_init(&priv->tc, &priv->cc, ktime_get_real_ns()); schedule_delayed_work(&priv->timestamp, MCP251XFD_TIMESTAMP_WORK_DELAY_SEC * HZ); } diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/sp= i/mcp251xfd/mcp251xfd.h index b35bfebd23f2..d6f6b3182e6a 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h @@ -954,6 +954,7 @@ int mcp251xfd_handle_tefif(struct mcp251xfd_priv *priv); void mcp251xfd_skb_set_timestamp(const struct mcp251xfd_priv *priv, struct sk_buff *skb, u32 timestamp); void mcp251xfd_timestamp_init(struct mcp251xfd_priv *priv); +void mcp251xfd_timestamp_start(struct mcp251xfd_priv *priv); void mcp251xfd_timestamp_stop(struct mcp251xfd_priv *priv); =20 void mcp251xfd_tx_obj_write_sync(struct work_struct *work); --=20 2.43.0