From nobody Thu Apr 9 18:46:40 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EF93313E05 for ; Fri, 6 Mar 2026 13:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772804558; cv=none; b=EcU6BdP+K/K5y4TiUOWCX5aI1tSezlfNRxooS944wH5daX5L3ZBmEZkkq1oV0ipd9ZV8z78IjLOVM/gTfOEMxBgTuhQ/BGuCEFBZiHE41G3OhFuy5WayUEsee8QQjrasC87EsmoY1hd51hS0ZkgXv8zAwSCy0a/lhpFNN1WOxoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772804558; c=relaxed/simple; bh=S9/Fzkiyb07FiSnwrS8MQmvi6Fitnuo1uoT04N7PIvE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sUCaM3liFMJIO/tGDtkxso1rzjy0mAJnU89mxp33TjVEUROMuB6kSclhO89wNHf89fs8eaiASBJcH2cwQCNTMpdS8aMJ00r+fgFNZwNssqCkzddKXvKKTlr3e+wvQQYsMM1Do3YIhL+OpGFhnKQnwjUqDHeyKDjAyKP1Vnou9do= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CkI9fPu+; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CkI9fPu+" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-439aa2f8ebaso4014502f8f.2 for ; Fri, 06 Mar 2026 05:42:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772804555; x=1773409355; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o0Ng/uajvfzozXdQpYK5vG2wa/u2Xjabl4u/B9UNDME=; b=CkI9fPu+4f/I4luh/7QtYvHZV6uOXYAphvjNk8iEaWpTQ1lFjD0nEHbztDCihwdWx+ Ee2j9SehyGjRh/zQ85uvtnuFohrI/k7JbOymNxt0fxPrLOobx8aBWDuJl6lFS3740LQd HCpLz+qauSHPZOnxvJnx2BCcdk+jSKyCI709i/9o+jnz0w1EFvn9MboUMViWVMD8evDG 0vxb+9Imt3LqARayhWBzn5tGXX+oHdpXJ97cH9U2tvEzyu+MqFRw1ZLQbCyy8pS1QDR4 jYzdIHxXxqy+fz+y/mVPf0jHtd8xw70Tn5dr2X0VAnJDviqpWjjCOQquC6tVIJbOxAeP Hd0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772804555; x=1773409355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=o0Ng/uajvfzozXdQpYK5vG2wa/u2Xjabl4u/B9UNDME=; b=oVEBe8VoXl1BCs9ukeK61OSqLSBztoMemaLOMyyVmTY7Hk2r259KxYSfdiKE6v2oir dmaNO7BUEtGKlhGiDDbg2BiQgYPCuIONCch8/2FA42hTQmAHqa/fVVc3Zge9oXpjH1hV qIIegSv1h09aXhn9okkU1lmj0SC4t0DdsrxoADMcjs/0f+08hj4i5RYfACle89ZH+XME cdkA4d5y7w2CX0iL7OKjcANKX9eAfukd/He/GQ6MT9QZfZ2Cg8YlvnSv5P5c5vaJ86Jb CDS/bjSs7gaF/3YaJh9XNLY2cDl7CFvt2NATh2EJO+YFi+7oMW6LSEBuNWzZyb77YwqG 7B9g== X-Forwarded-Encrypted: i=1; AJvYcCVZ70uquHVpm6OCWgyv09Y1pTQ/ZWtMpB9s5ezjGL8+nnHK2fZADlT30fgY3G/vGuR/3NbiZhIHh9tJLS4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3vh+Rs15OthbILNAjIqhip8sd0jHs71dDXh5HyrGVWUpAzMaL YJdzmGGq7jdJIiPo3iSnXIxcXJVhaUJ5VpA3aHIvyLsCbP24GtUjeT+j X-Gm-Gg: ATEYQzwatUn0fNufTSXd2em4Pf5/BADAhxTMuPnE2BMZH1AVqWYYQ3MbzYF2GgGJs5M 3t/Pgm3An2mI3ILdurHFsRWCvvRR0D1shD8pnsEC+nTHIqFMM1vFOgpVqojY9I7ZU0l3q1bWaOY JChVRC2GgNEdwTu2d7v3ppTjSb+I4nM5AyHAUgZNhSUZ1KIY3HpaZBk7DrmH1YlyLC2uBYCTd08 alwHK7NZ4feeByKAmONPMOmWaUy4uKGSb810JKrmkGtohZuKU4yMrq6Xfy2qUDtZYNQYshpQyf+ zfUk4eY/9uJtLry+7SYs7WAilxaK8jBbBRvUjq3IPICkH5Gh8dotC5ZgYYjp0aNkJJ/Nhg059OV j+Ls0BADYMyn5mcqX232IS5coX3MkEvLV0NIXaL6YG65pQzqqqufFOQgoQsT/Kax5G6RC9tyIhu M1zXDDXwYBw2vGzrehso4LeUVmoHlkUAB+vwcJFe1IG+a74fs= X-Received: by 2002:a5d:6384:0:b0:439:de1d:74ae with SMTP id ffacd0b85a97d-439de1d7642mr933964f8f.22.1772804554816; Fri, 06 Mar 2026 05:42:34 -0800 (PST) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:d0f3:534:36a3:523a]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadb85b8sm4223790f8f.17.2026.03.06.05.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 05:42:34 -0800 (PST) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Philipp Zabel Cc: Biju Das , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH 3/3] clk: renesas: rzg2l-cpg: Re-enable critical module clocks during resume Date: Fri, 6 Mar 2026 13:42:25 +0000 Message-ID: <20260306134228.871815-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260306134228.871815-1-biju.das.jz@bp.renesas.com> References: <20260306134228.871815-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das After a suspend/resume cycle, critical module clocks may be left disabled as the hardware state is not automatically restored. Unlike regular clocks which are re-enabled by their respective drivers, critical clocks (CLK_IS_CRITICAL) have no owning driver to restore them, so the CPG driver must take responsibility for re-enabling them on resume. Introduce struct rzg2l_crit_clk_hw to track critical module clock hardware entries in a singly-linked list anchored at crit_clk_hw_head in rzg2l_cpg_priv. Populate the list during module clock registration by checking for the CLK_IS_CRITICAL flag after clk_hw_register() succeeds. On resume, walk the list and re-enable any critical module clock that is found to be disabled, before deassering critical resets, ensuring the correct clock-before-reset restore ordering. Signed-off-by: Biju Das --- drivers/clk/renesas/rzg2l-cpg.c | 42 ++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index 8165c163143a..f16c3962e0bd 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -130,6 +130,12 @@ struct div_hw_data { u32 width; }; =20 +/* Critical clk list */ +struct rzg2l_crit_clk_hw { + struct clk_hw *hw; + struct rzg2l_crit_clk_hw *next; +}; + #define to_div_hw_data(_hw) container_of(_hw, struct div_hw_data, hw_data) =20 struct rzg2l_pll5_param { @@ -168,6 +174,7 @@ struct rzg2l_pll5_mux_dsi_div_param { * @info: Pointer to platform data * @genpd: PM domain * @mux_dsi_div_params: pll5 mux and dsi div parameters + * @crit_clk_hw_head: Head of the linked list critical clk entries */ struct rzg2l_cpg_priv { struct reset_controller_dev rcdev; @@ -186,8 +193,26 @@ struct rzg2l_cpg_priv { struct generic_pm_domain genpd; =20 struct rzg2l_pll5_mux_dsi_div_param mux_dsi_div_params; + + struct rzg2l_crit_clk_hw *crit_clk_hw_head; }; =20 +static int rzg2l_cpg_add_crit_clk_hw_entry(struct rzg2l_cpg_priv *priv, + struct clk_hw *hw) +{ + struct rzg2l_crit_clk_hw *node; + + node =3D devm_kzalloc(priv->dev, sizeof(*node), GFP_KERNEL); + if (!node) + return -ENOMEM; + + node->hw =3D hw; + node->next =3D priv->crit_clk_hw_head; + priv->crit_clk_hw_head =3D node; + + return 0; +} + static inline u8 rzg2l_cpg_div_ab(u8 a, u8 b) { return (b + 1) << a; @@ -1737,10 +1762,16 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_c= lk *mod, goto fail; } =20 + if (init.flags & CLK_IS_CRITICAL) { + if (rzg2l_cpg_add_crit_clk_hw_entry(priv, &clock->hw)) { + clk =3D ERR_PTR(-ENOMEM); + goto fail; + } + } + clk =3D clock->hw.clk; dev_dbg(dev, "Module clock %pC at %lu Hz\n", clk, clk_get_rate(clk)); priv->clks[id] =3D clk; - return; =20 fail: @@ -2086,8 +2117,17 @@ static int __init rzg2l_cpg_probe(struct platform_de= vice *pdev) static int rzg2l_cpg_resume(struct device *dev) { struct rzg2l_cpg_priv *priv =3D dev_get_drvdata(dev); + struct rzg2l_crit_clk_hw *node; int ret; =20 + for (node =3D priv->crit_clk_hw_head; node; node =3D node->next) { + if (!rzg2l_mod_clock_is_enabled(node->hw)) { + ret =3D rzg2l_mod_clock_endisable(node->hw, true); + if (ret) + return ret; + } + } + ret =3D rzg2l_cpg_deassert_crit_resets(&priv->rcdev, priv->info); if (ret) return ret; --=20 2.43.0