From nobody Mon Apr 6 23:12:36 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 0A8D1346A19 for ; Tue, 17 Mar 2026 19:56:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773777421; cv=none; b=hj2eNMvadGjpozZmCDEx+2XR/9PdrLg+A1p9oD+ZCvts8l9d4VKQeqtrdIa0GrB0vtf7a0PQtbUN8h2Ckaoz5amjSBmuhQ3L1QFYpdkycwfreEH6IeBu36kyxk0JP2hWeFW9BWh1jTucVv5d5jou67iu/RZhvBk3zNgbcSQT7hI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773777421; c=relaxed/simple; bh=/pfeBRZlSAeIZP2jyTAgG02IfuvKN3sK7yiMk55tNm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ksfV2xM6j42nPQsJ2pe3ErR+MKiEvGt3QRVR/taCKIRV1u3mz6suIB06ScqAax4200S1JWmkEf9q8E8mXDS64kSdaNhHWdGFv9qM0qL2VQZy+gGuz0lvnbL0kKR6IK6A48DuwUUdt1PbRloR/6jH303cqwWG47XmcVtq7U8W/WI= 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=CuAnWhYv; arc=none smtp.client-ip=209.85.221.51 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="CuAnWhYv" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-43b4915161fso1673327f8f.2 for ; Tue, 17 Mar 2026 12:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773777418; x=1774382218; 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=qy4MN32IlylccBxs69pXyCRPQ6AWrwsSuWmABVQKBWQ=; b=CuAnWhYvpc5/KS4Veot31dAxGCS3Ok4Coi0J7DrJZ0o4HoG2BjYX/33PIhg+O/J5mu 0UhCeOwndahi5EmL+UhGb5DHPixOV5XE+IkG4cnYTO7yrwAoOAsOz2fofkzw2L1t8mMa FTSDlnUtCm5dd7Nk+DRSEIZeYA5K9pOHwLLRg3nkehaDwZaYbZxndjxwCby6qKmqTLQk Mhcz93BXN4wXPs3GAh1kZFfdDTZrpRe86fUq1qYLCxJL7vx7rc/ZJ9XCQ0CGZHteAxRP mOhCF/QKwFCGBt52Azj3fGPAAET5alIMe7oAMqB/T8vx3qdA54J2jw/IyG3VKV6e/V6+ 8jZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773777418; x=1774382218; 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=qy4MN32IlylccBxs69pXyCRPQ6AWrwsSuWmABVQKBWQ=; b=r9zzMnXFlYinJpfmVA8ydSUySvZYWHMpZzHqAtQsla6om+S1Xw25xUM2kwGAJBkAfj VFGqIMGdbr2xL64F9mwW9Vk3c+5pWGTGmxKa3mBAGZuE2oFCTeapF9G9t97ZLe8npW2e QLuB2NPLirfWAnZiri5Rg60BKdY1oT+BLujtFvRmC7AeVHRhEajRcyJT+Gcxb76nPgoC ZVhpdWA4DvvQ6Ej/AstmQLim+PEih1mOcmFCW5H3YkLdfFQE/tTtUnTcWhGq+jtcD0iI XZoGX75JLfABzMQMTgme12B/XbO2PloTKFfD1rtUEmgibiUzZ5ZOU2xyGPjwxwi2B6Wu IN9w== X-Forwarded-Encrypted: i=1; AJvYcCVv4ZwRsiLyFp5bDTW3b5jFt5bGr4pDDR3oAAL8vY6YsdTMALmmWNqTTKK5480+aVg1T/OYJpEd5du/NNY=@vger.kernel.org X-Gm-Message-State: AOJu0YxyLkY3cdINURt/NrgZu5VZAA5fiVLfmrA+E82J4kuPRqa9W/FB PVg7FvKmbuV+6TP5133UBezAEq0LHvzRauHzQQ1S86AA2zCIPe2HzABs X-Gm-Gg: ATEYQzy0FyFQK6ygl6VnnNS+xMKWejE3aDi94E5d5BHmmP34Y261A+PomaS8deGgzGp elQS0OZ3ul2Uep6IDzIp4g9zBa7Ms6RD3ea/NCFP/sHtBLnkvac0lcFdsZDzq61eKTA4RaxmMhe f819k+WRhSj82vWt1OzA6iE2CLEqbSZsvv+6PHuTq6PT+xyJnV6muWkzkbGupfSIM8kiDWW2qq6 OkzJgdeTbu6RDAINCiufw0FIgCSMJBzWbmzDu8/CxigmZa/vXA+s5cgrAkrHRr6ubuY4tLVzwVi iH+h5afZGD0+M8qnbgHUDpuleFXCS5aMxo9Cx885yc7wZ58EmKdTfiYKv45VxE6UfYUcu1qMoGz y4TB4fMD2VluzAkIWecd0Uu2EkMdmk8osznP861RxGNWLDJ+8zA0qrZffGA1+VVdo5n4nm1CyHQ vQG489pl9W+1x5w3U8sqLMnIi7/jnqKDSbXqSruI7pFrhEVukj X-Received: by 2002:a05:6000:608:b0:43b:4489:d450 with SMTP id ffacd0b85a97d-43b527c52famr974355f8f.30.1773777418084; Tue, 17 Mar 2026 12:56:58 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:e16b:fc56:e220:9aa9]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b5189221dsm1339217f8f.23.2026.03.17.12.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 12:56:57 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Magnus Damm Cc: Biju Das , linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v4 4/9] clk: renesas: rzg2l-cpg: Re-enable critical module clocks during resume Date: Tue, 17 Mar 2026 19:56:33 +0000 Message-ID: <20260317195650.468330-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260317195650.468330-1-biju.das.jz@bp.renesas.com> References: <20260317195650.468330-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 deasserting critical resets, ensuring the correct clock-before-reset restore ordering. Signed-off-by: Biju Das --- v4: * Moved this patch from [1] as it is boot-dependent [1] https://lore.kernel.org/all/20260306134228.871815-1-biju.das.jz@bp.ren= esas.com/ --- drivers/clk/renesas/rzg2l-cpg.c | 41 +++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index 8165c163143a..c2d31b93f62b 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,6 +1762,13 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_cl= k *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; @@ -2086,8 +2118,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