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 20F5C359F9C; Fri, 9 Jan 2026 12:25:27 +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=1767961527; cv=none; b=KuoBKzPgkKgOh1pyAjwiC0HOAGXAsu+DA/87fHeNq9BZpX7rCwoBSeXDGM6KxJ8KAGPgZ8/B/J6pN+NCMfbkY9dTjM6FxExLSDTXHOodIAdUIToQ/ludxrI03DJoP5agbj5L95HG6Wb6YxfB/ASgzlcGixE/l++RVE0Ai7+qMfs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767961527; c=relaxed/simple; bh=Saa0KlKahDKpeAIpEKleulfhEHssdqKWAPS6+LFEBwo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UGq9i8KQYKdN1bvpzYBMuZqCI9FZgFk6alvN95H+3kMRhfwbxV/qZ9yrZrbZn5eQU7lsh2IadcPLZ4FXJ/7BbgcUtB6XiCtcH3//BS0snWDKS7yXW4zvTnSGd+joGHOVMVPxy70w0FYUx8v32wOb128wlvo1cLYSVSh0bbtpWLY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YeZ3F5Oc; 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="YeZ3F5Oc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8945CC4CEF1; Fri, 9 Jan 2026 12:25:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1767961526; bh=Saa0KlKahDKpeAIpEKleulfhEHssdqKWAPS6+LFEBwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YeZ3F5OcKW77eiJ4g5F5R8bNXTLOS6CxKmGqRgrkPKLJs2COPzISLmzAMCwzCR2Gs 60pF1JqCv49eQdLk0GvkvWCtLoztJbRg+nHXNYBljCY40jDerT27i9E5wlZ928eEAH wp2JRnNhPLGxkh55Ql8DovhZ0B9xoeBIZVvlqE8Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Vasut , Geert Uytterhoeven , Sasha Levin Subject: [PATCH 6.1 046/634] clk: renesas: cpg-mssr: Add missing 1ms delay into reset toggle callback Date: Fri, 9 Jan 2026 12:35:24 +0100 Message-ID: <20260109112119.178974077@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260109112117.407257400@linuxfoundation.org> References: <20260109112117.407257400@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Vasut [ Upstream commit 62abfd7bedc2b3d86d4209a4146f9d2b5ae21fab ] R-Car V4H Reference Manual R19UH0186EJ0130 Rev.1.30 Apr. 21, 2025 page 583 Figure 9.3.1(a) Software Reset flow (A) as well as flow (B) / (C) indicate after reset has been asserted by writing a matching reset bit into register SRCR, it is mandatory to wait 1ms. This 1ms delay is documented on R-Car V4H and V4M, it is currently unclear whether S4 is affected as well. This patch does apply the extra delay on R-Car S4 as well. Fix the reset driver to respect the additional delay when toggling resets. Drivers which use separate reset_control_(de)assert() must assure matching delay in their driver code. Fixes: 0ab55cf18341 ("clk: renesas: cpg-mssr: Add support for R-Car V4H") Signed-off-by: Marek Vasut Reviewed-by: Geert Uytterhoeven Link: https://patch.msgid.link/20250918030552.331389-1-marek.vasut+renesas@mailbox.org Signed-off-by: Geert Uytterhoeven Signed-off-by: Sasha Levin --- drivers/clk/renesas/renesas-cpg-mssr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index 523fd45231571..d6137379510c1 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c @@ -618,8 +618,15 @@ static int cpg_mssr_reset(struct reset_controller_dev *rcdev, /* Reset module */ writel(bitmask, priv->base + priv->reset_regs[reg]); - /* Wait for at least one cycle of the RCLK clock (@ ca. 32 kHz) */ - udelay(35); + /* + * On R-Car Gen4, delay after SRCR has been written is 1ms. + * On older SoCs, delay after SRCR has been written is 35us + * (one cycle of the RCLK clock @ ca. 32 kHz). + */ + if (priv->reg_layout == CLK_REG_LAYOUT_RCAR_GEN4) + usleep_range(1000, 2000); + else + usleep_range(35, 1000); /* Release module from reset state */ writel(bitmask, priv->base + priv->reset_clear_regs[reg]); -- 2.51.0