From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B676C3D47B8 for ; Fri, 14 Aug 2026 19:50:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786737049; cv=none; b=LeL/D5+pT/7TerFwImXoX6gPXFZip0FJVea6w8/63y6ZlZa0auFivZ3LiFu3OZDTnVHSI7ISKMHoRDhyaeanvzCTzKDJCy4113MQ9d7WtAkAu8M7ZqFHzRE+R//Of32DoWhWciPI8x60tZnLIVcCNq7qZx7CnJMLYOQjHDmOrjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786737049; c=relaxed/simple; bh=pjd2vtCGQ52exGg16nTML5/ylDbZwOjRhtlULic+vZU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f7/yQiawE5RiIosmBQDpDBIE33r+xtUOXpvy+mexmW83Z2AqLf4cu4qbI5fBUuUMj+c+bZUwN6j3ZWGK9yanQHRRRgww0vo5hdFgsOcbMECkBkVeBR3AUgkgTxGS1F0JqZjhyh/CaodWx3oUzUin9KfXcnVk9mGKvmSFaxiEYoA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cK37EyxX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cK37EyxX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD8871F000E9; Fri, 14 Aug 2026 19:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786737047; bh=Fw7RrvnTWHnqX9RzHID+/byrx/atQW0j8D9qH763BkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cK37EyxXeBtMuBBCHjI54zIIn0vTZ+EGKKqfFXkHYIZQrBb8S0RVNC216xX/9ysDf hMyFklaHXSCxLbkF+3Jln18Gzaq1loAWlnC/rOnDPer2lSoVpp5e8N6hgLMgEFgn9L raJXMJCG1DJBhaRAv3viR3/oOVDwc4N5miwDcfzdoJMF3wCFPdKK2EkecGxF6MGWv1 aB8I/d0UvaiUTPgCCIVHqhAtfKQHKXsuaF2O93Sp9HpKfeiyvWAO29rWRTFvXYtZO9 kefRpxZ6IIF7WlXRUF4ZJLtXZSh6tICGgY+68DSr7h3OQmD3Sq59lAen9TVVTpiJ9C 5z77E/Vhu8bPQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Tu Nguyen , Biju Das , Claudiu Beznea , Geert Uytterhoeven , Vincent Mailhol , stable@kernel.org, Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.1.y 4/4] can: rcar_canfd: change the initializing flow for clocks and resets Date: Fri, 14 Aug 2026 15:50:41 -0400 Message-ID: <20260814195041.365045-4-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260814195041.365045-1-sashal@kernel.org> References: <2026080504-effects-snap-d572@gregkh> <20260814195041.365045-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tu Nguyen [ Upstream commit bef9004c5b91debfceaea2841855a4ebe81ff2b3 ] Testing CANFD on RZ/G3E shows that many registers do not reset to their initial values with the current flow of deasserting resets first and then enabling clocks. Based on the HW manual, clocks should be supplied first and the resets deasserted afterward. section 7.4.3 Procedure for Activating Modules: RZ/G2L section 4.4.9.3 Procedure for Starting up Units: RZ/G3E So, update the order of the initializing flow for resets and clocks to match the hardware manual, resetting all CANFD registers to their initial values. Also update rcar_canfd_global_deinit() to assert resets before disabling clocks, so the teardown path mirrors the new init ordering. Fixes: 76e9353a80e9 ("can: rcar_canfd: Add support for RZ/G2L family") Signed-off-by: Tu Nguyen Signed-off-by: Biju Das Tested-by: Claudiu Beznea Reviewed-by: Geert Uytterhoeven Reviewed-by: Vincent Mailhol Link: https://patch.msgid.link/20260625135216.130450-1-biju.das.jz@bp.renesas.com Cc: stable@kernel.org Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/rcar/rcar_canfd.c | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index be2c557deaeca..cb6e2f93db927 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -1817,20 +1817,12 @@ static int rcar_canfd_global_init(struct rcar_canfd_global *gpriv) u32 ch, sts; int err; - err = reset_control_reset(gpriv->rstc1); - if (err) - return err; - - err = reset_control_reset(gpriv->rstc2); - if (err) - goto fail_reset1; - /* Enable peripheral clock for register access */ err = clk_prepare_enable(gpriv->clkp); if (err) { dev_err(dev, "failed to enable peripheral clock: %pe\n", ERR_PTR(err)); - goto fail_reset2; + return err; } /* Enable RAM clock */ @@ -1841,10 +1833,18 @@ static int rcar_canfd_global_init(struct rcar_canfd_global *gpriv) goto fail_clk; } + err = reset_control_reset(gpriv->rstc1); + if (err) + goto fail_ram_clk; + + err = reset_control_reset(gpriv->rstc2); + if (err) + goto fail_reset1; + err = rcar_canfd_reset_controller(gpriv); if (err) { dev_err(dev, "reset controller failed: %pe\n", ERR_PTR(err)); - goto fail_ram_clk; + goto fail_reset2; } /* Controller in Global reset & Channel reset mode */ @@ -1882,14 +1882,14 @@ static int rcar_canfd_global_init(struct rcar_canfd_global *gpriv) fail_mode: rcar_canfd_disable_global_interrupts(gpriv); -fail_ram_clk: - clk_disable_unprepare(gpriv->clk_ram); -fail_clk: - clk_disable_unprepare(gpriv->clkp); fail_reset2: reset_control_assert(gpriv->rstc2); fail_reset1: reset_control_assert(gpriv->rstc1); +fail_ram_clk: + clk_disable_unprepare(gpriv->clk_ram); +fail_clk: + clk_disable_unprepare(gpriv->clkp); return err; } @@ -1904,10 +1904,10 @@ static void rcar_canfd_global_deinit(struct rcar_canfd_global *gpriv, bool full) rcar_canfd_set_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GSLPR); } - clk_disable_unprepare(gpriv->clk_ram); - clk_disable_unprepare(gpriv->clkp); reset_control_assert(gpriv->rstc2); reset_control_assert(gpriv->rstc1); + clk_disable_unprepare(gpriv->clk_ram); + clk_disable_unprepare(gpriv->clkp); } static int rcar_canfd_probe(struct platform_device *pdev) -- 2.53.0