From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 36D261AB6F1; Tue, 30 Sep 2025 14:53:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759244015; cv=none; b=qSTVT9V2UUSUTgDqmHCi6WzKrgonkLuPBff5YZg8fZ57a/H105xkHxjU5ugJhIKAb1Ljq42jCTonqMOv19+1jsvs+qEUeM+nyJ0UaTpEfcmgr74Z6TcLrP7ylY5EydCKjep+HzXy1JFoQgYPf3rgD1TzrxDuHRWL5DXmJ9sdGXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759244015; c=relaxed/simple; bh=nBQsmbDu8p8Eeb73SelSWqfTavG8xPo9+0RIqb4qPYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h1ZmcG6zoHxzhlLjRkQRBMtBURWn++zO9sKMiq5phqeIde+6lHUgQODmcQ/fX149DddvcE6TTc9PZyDeDT0q12t4vYp2Q9WL/OI9iY6/ebs6b8rawRrU5TK4hbMPJplVV/E/+BhiQ2h08mwKLdfavsPt4eSpuQg0+3cwYGwY/Kg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=skWCodF9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="skWCodF9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93A00C4CEF0; Tue, 30 Sep 2025 14:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759244015; bh=nBQsmbDu8p8Eeb73SelSWqfTavG8xPo9+0RIqb4qPYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=skWCodF931sYfBPcmsiVx51IbysZnkjDrb/kei8V6FpKP3hqEosBE3raUisbcV5PJ 0CrztNGIUVS8IQjgUgYmld3IRl4DzbpS1vnJeK8g9vGUAdJM+oaWq65t6MJFAE9OfO bBGb5DnhHvnPHE0bJH/HEapRvlVYXE9H9TsQLf/4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Geert Uytterhoeven , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 5.4 64/81] can: rcar_can: rcar_can_resume(): fix s2ram with PSCI Date: Tue, 30 Sep 2025 16:47:06 +0200 Message-ID: <20250930143822.360352832@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143819.654157320@linuxfoundation.org> References: <20250930143819.654157320@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Geert Uytterhoeven [ Upstream commit 5c793afa07da6d2d4595f6c73a2a543a471bb055 ] On R-Car Gen3 using PSCI, s2ram powers down the SoC. After resume, the CAN interface no longer works, until it is brought down and up again. Fix this by calling rcar_can_start() from the PM resume callback, to fully initialize the controller instead of just restarting it. Signed-off-by: Geert Uytterhoeven Link: https://patch.msgid.link/699b2f7fcb60b31b6f976a37f08ce99c5ffccb31.1755165227.git.geert+renesas@glider.be Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/rcar/rcar_can.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c index b99b1b235348c..087c9d16118b5 100644 --- a/drivers/net/can/rcar/rcar_can.c +++ b/drivers/net/can/rcar/rcar_can.c @@ -869,7 +869,6 @@ static int __maybe_unused rcar_can_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct rcar_can_priv *priv = netdev_priv(ndev); - u16 ctlr; int err; if (!netif_running(ndev)) @@ -881,12 +880,7 @@ static int __maybe_unused rcar_can_resume(struct device *dev) return err; } - ctlr = readw(&priv->regs->ctlr); - ctlr &= ~RCAR_CAN_CTLR_SLPM; - writew(ctlr, &priv->regs->ctlr); - ctlr &= ~RCAR_CAN_CTLR_CANM; - writew(ctlr, &priv->regs->ctlr); - priv->can.state = CAN_STATE_ERROR_ACTIVE; + rcar_can_start(ndev); netif_device_attach(ndev); netif_start_queue(ndev); -- 2.51.0