From patchwork Wed Jan 31 16:09:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13539589 X-Patchwork-Delegate: geert@linux-m68k.org Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8409812AAD0; Wed, 31 Jan 2024 16:10:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717405; cv=none; b=SihoIUtx9VZc6G4yrvGOwmYXieZjg52Rd0T8Vv23ryj/pQYXuhVHM/fqK8ThqgTgglgjrxYpOIP5w1WtmPDpmqA3yMuuQ3JXLKQ3x9ws5QJrkTLzn62S/BntfoSRo2ISwOsgkmqrS2qIgw72z0pYdmyJq9gaCzUYYCyKuOVSBYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717405; c=relaxed/simple; bh=PzlcyskeaJMVZearUzCnT+cffoRvNKWn4ffgB0EkA2M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qF0JLgcvQT7f883RD0uvbIt98c+3CkhjKiCUScKLCf412u5BZtz2qaCWKPTOP8ON0I/a60UibSx+Hd9Ht348gFEKOYP6m5IbXhOpeeaUloqxDENN9UIY8ddj3pLTdKcgwUtmgx4tg9pp4/pRjVEsLeqD6CkSjHmPfYtsyFGNTxs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-IronPort-AV: E=Sophos;i="6.05,231,1701097200"; d="scan'208";a="196312852" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 01 Feb 2024 01:09:59 +0900 Received: from localhost.localdomain (unknown [10.226.92.227]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 7A8CA40183E5; Thu, 1 Feb 2024 01:09:55 +0900 (JST) From: Biju Das To: Michael Turquette , Stephen Boyd , Sakari Ailus , Laurent Pinchart , Russell King Cc: Biju Das , linux-clk@vger.kernel.org, Geert Uytterhoeven , Prabhakar Mahadev Lad , Biju Das , linux-renesas-soc@vger.kernel.org Subject: [PATCH RFC 1/3] clk: Add clk_disable_unprepare_sync() Date: Wed, 31 Jan 2024 16:09:45 +0000 Message-Id: <20240131160947.96171-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> References: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently clk_disable() is not synchronous. Consumers just gate the clock, but it doesn't check actually the clock is gated. Introduce clk_disable_unprepare_sync() to synchronize the clock gate operation. Signed-off-by: Biju Das --- drivers/clk/clk.c | 36 +++++++++++++++++++++++++++--------- include/linux/clk-provider.h | 4 ++++ include/linux/clk.h | 25 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 2253c154a824..958d6677b3a6 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1080,7 +1080,7 @@ int clk_prepare(struct clk *clk) } EXPORT_SYMBOL_GPL(clk_prepare); -static void clk_core_disable(struct clk_core *core) +static void clk_core_disable(struct clk_core *core, bool sync) { lockdep_assert_held(&enable_lock); @@ -1102,17 +1102,20 @@ static void clk_core_disable(struct clk_core *core) if (core->ops->disable) core->ops->disable(core->hw); + if (sync && core->ops->disable_sync) + core->ops->disable_sync(core->hw); + trace_clk_disable_complete(core); - clk_core_disable(core->parent); + clk_core_disable(core->parent, false); } -static void clk_core_disable_lock(struct clk_core *core) +static void clk_core_disable_lock(struct clk_core *core, bool sync) { unsigned long flags; flags = clk_enable_lock(); - clk_core_disable(core); + clk_core_disable(core, sync); clk_enable_unlock(flags); } @@ -1133,10 +1136,25 @@ void clk_disable(struct clk *clk) if (IS_ERR_OR_NULL(clk)) return; - clk_core_disable_lock(clk->core); + clk_core_disable_lock(clk->core, false); } EXPORT_SYMBOL_GPL(clk_disable); +/** + * clk_disable_sync - gate a clock synchronously + * @clk: the clk being gated + * + * It is similar to clk_disable, but guarantees that clk is gated synchronously. + */ +void clk_disable_sync(struct clk *clk) +{ + if (IS_ERR_OR_NULL(clk)) + return; + + clk_core_disable_lock(clk->core, true); +} +EXPORT_SYMBOL_GPL(clk_disable_sync); + static int clk_core_enable(struct clk_core *core) { int ret = 0; @@ -1164,7 +1182,7 @@ static int clk_core_enable(struct clk_core *core) trace_clk_enable_complete(core); if (ret) { - clk_core_disable(core->parent); + clk_core_disable(core->parent, false); return ret; } } @@ -1340,7 +1358,7 @@ static int clk_core_prepare_enable(struct clk_core *core) static void clk_core_disable_unprepare(struct clk_core *core) { - clk_core_disable_lock(core); + clk_core_disable_lock(core, false); clk_core_unprepare_lock(core); } @@ -2058,7 +2076,7 @@ static void __clk_set_parent_after(struct clk_core *core, * for preventing a race with clk_enable(). */ if (core->prepare_count) { - clk_core_disable_lock(core); + clk_core_disable_lock(core, false); clk_core_disable_unprepare(old_parent); } @@ -2352,7 +2370,7 @@ static void clk_change_rate(struct clk_core *core) core->rate = clk_recalc(core, best_parent_rate); if (core->flags & CLK_SET_RATE_UNGATE) { - clk_core_disable_lock(core); + clk_core_disable_lock(core, false); clk_core_unprepare(core); } diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 1293c38ddb7f..604cc9338465 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -115,6 +115,9 @@ struct clk_duty { * @disable: Disable the clock atomically. Called with enable_lock held. * This function must not sleep. * + * @disable_sync: Disable and sync the clockatomically. Called with enable_lock + * held.This function must not sleep. + * * @is_enabled: Queries the hardware to determine if the clock is enabled. * This function must not sleep. Optional, if this op is not * set then the enable count will be used. @@ -238,6 +241,7 @@ struct clk_ops { void (*unprepare_unused)(struct clk_hw *hw); int (*enable)(struct clk_hw *hw); void (*disable)(struct clk_hw *hw); + void (*disable_sync)(struct clk_hw *hw); int (*is_enabled)(struct clk_hw *hw); void (*disable_unused)(struct clk_hw *hw); int (*save_context)(struct clk_hw *hw); diff --git a/include/linux/clk.h b/include/linux/clk.h index 06f1b292f8a0..f472756310c7 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -664,6 +664,23 @@ int __must_check clk_bulk_enable(int num_clks, */ void clk_disable(struct clk *clk); +/** + * clk_disable_sync - inform the system when the clock source is no longer + * required. + * @clk: clock source + * + * Inform the system that a clock source is no longer required by + * a driver and is in shut down. + * + * May be called from atomic contexts. + * + * Implementation detail: if the clock source is shared between + * multiple drivers, clk_enable() calls must be balanced by the + * same number of clk_disable_sync() calls for the clock source to be + * disabled. + */ +void clk_disable_sync(struct clk *clk); + /** * clk_bulk_disable - inform the system when the set of clks is no * longer required. @@ -995,6 +1012,8 @@ static inline int __must_check clk_bulk_enable(int num_clks, static inline void clk_disable(struct clk *clk) {} +static inline void clk_disable_sync(struct clk *clk) {} + static inline void clk_bulk_disable(int num_clks, const struct clk_bulk_data *clks) {} @@ -1086,6 +1105,12 @@ static inline void clk_disable_unprepare(struct clk *clk) clk_unprepare(clk); } +static inline void clk_disable_unprepare_sync(struct clk *clk) +{ + clk_disable_sync(clk); + clk_unprepare(clk); +} + static inline int __must_check clk_bulk_prepare_enable(int num_clks, const struct clk_bulk_data *clks) { From patchwork Wed Jan 31 16:09:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13539590 X-Patchwork-Delegate: geert@linux-m68k.org Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B04287BAF6; Wed, 31 Jan 2024 16:10:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717405; cv=none; b=gP+r2CneeZmnz9x84+wMPBSUxic2FP8mo/q9sBhXXTtgaWn9WfKoxZPXpp9bGBZEQ3m4VdD0jk3DycMZLYYXEC77//4aNDCg7aEidJjQY1tzWT28yV1d7RZlLxmpZvB8A+ksg5LUan3PjW9Nh6iX8iw/N4IeGIB4D7iAKpq3yUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717405; c=relaxed/simple; bh=wfZbABjM6ffoj/xE+W20JzOuK2YWdPNXUfTx4omHDuI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CW39J4gEmP48mdyFkxFLW6ATqfKXZKfn3TfBAuwAt9rvnQ7c8iIMQSkMpGf1MjJDW/NWCpY1fnM2YQBd1zhbN51sfyIKJFGWrvHuYaYk34D0w0l7yDvAuYIaQABBYx+aO/4VhmOQ3JUcOuoybPpAPxXRYpkOg/67e2tDf2gy/Jg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-IronPort-AV: E=Sophos;i="6.05,231,1701097200"; d="scan'208";a="196312860" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 01 Feb 2024 01:10:02 +0900 Received: from localhost.localdomain (unknown [10.226.92.227]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id A52FD40180CD; Thu, 1 Feb 2024 01:09:59 +0900 (JST) From: Biju Das To: Michael Turquette , Stephen Boyd Cc: Biju Das , Geert Uytterhoeven , Sakari Ailus , Laurent Pinchart , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH RFC 2/3] clk: renesas: rzg2l: Add disable_sync() callback Date: Wed, 31 Jan 2024 16:09:46 +0000 Message-Id: <20240131160947.96171-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> References: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add disable_sync() callback to synchronize clk gating operation. Signed-off-by: Biju Das --- drivers/clk/renesas/rzg2l-cpg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c index 3d2daa4ba2a4..7baf0d7217e2 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -1277,6 +1277,28 @@ static void rzg2l_mod_clock_disable(struct clk_hw *hw) rzg2l_mod_clock_endisable(hw, false); } +static void rzg2l_mod_clock_disable_sync(struct clk_hw *hw) +{ + struct mstp_clock *clock = to_mod_clock(hw); + struct rzg2l_cpg_priv *priv = clock->priv; + struct device *dev = priv->dev; + unsigned int reg = clock->off; + u32 bitmask = BIT(clock->bit); + u32 value; + int error; + + rzg2l_mod_clock_disable(hw); + + if (!priv->info->has_clk_mon_regs) + return; + + error = readl_poll_timeout_atomic(priv->base + CLK_MON_R(reg), value, + !(value & bitmask), 0, 10); + if (error) + dev_err(dev, "Failed to disable CLK %p\n", + priv->base + CLK_ON_R(reg)); +} + static int rzg2l_mod_clock_is_enabled(struct clk_hw *hw) { struct mstp_clock *clock = to_mod_clock(hw); @@ -1303,6 +1325,7 @@ static int rzg2l_mod_clock_is_enabled(struct clk_hw *hw) static const struct clk_ops rzg2l_mod_clock_ops = { .enable = rzg2l_mod_clock_enable, .disable = rzg2l_mod_clock_disable, + .disable_sync = rzg2l_mod_clock_disable_sync, .is_enabled = rzg2l_mod_clock_is_enabled, }; From patchwork Wed Jan 31 16:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13539591 X-Patchwork-Delegate: kieran@bingham.xyz Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98BAA12A148; Wed, 31 Jan 2024 16:10:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.160.252.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717410; cv=none; b=rzARPV+z0JDZU/hRiMuqNm0r7T3FLmFnbc90+tUYubOlA4Xd3YMjhbv/J5dITqa48aaE10NS6+ZDsysBdRZYEsqda/gKWp/FiKJmxTrvT9k54ZunsRV90kxczOqfrQlgjebslNN0Z6xF2zg30nbykOHkc8ydMZC1yKnER35f0fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706717410; c=relaxed/simple; bh=12cYme6x/taHknHj3lS2U5xAwlTbyFCg7tD1Xg65RHw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=psURhYxthAARU4yO82AOPnllhZt9ydJJ6rmghdtRLH6gFd2Pn40iDoH7c+cenlUVFtOFlCRvHsmzEImj/Zq2LMNwntVaWPIUbQ3Is3MrAv2YhzPftZP4LM399uS5vBGZdBH63b8jmqXw3Jd34OHsgYephkTVFlVXbE2lbQYHUr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com; spf=pass smtp.mailfrom=bp.renesas.com; arc=none smtp.client-ip=210.160.252.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=bp.renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bp.renesas.com X-IronPort-AV: E=Sophos;i="6.05,231,1701097200"; d="scan'208";a="192402259" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 01 Feb 2024 01:10:07 +0900 Received: from localhost.localdomain (unknown [10.226.92.227]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 5D7774018855; Thu, 1 Feb 2024 01:10:03 +0900 (JST) From: Biju Das To: Mauro Carvalho Chehab Cc: Biju Das , Hans Verkuil , Sakari Ailus , Stephen Boyd , Laurent Pinchart , Lad Prabhakar , Rob Herring , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-media@vger.kernel.org, Geert Uytterhoeven , Biju Das , linux-renesas-soc@vger.kernel.org Subject: [PATCH RFC 3/3] media: platform: rzg2l-cru: rzg2l-video: Use clk_disable_unprepare_sync() Date: Wed, 31 Jan 2024 16:09:47 +0000 Message-Id: <20240131160947.96171-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> References: <20240131160947.96171-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use the clk_disable_unprepare_sync() for synchronizing clk gating in rzg2l_csi2_mipi_link_enable() Signed-off-by: Biju Das --- drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c index e68fcdaea207..8d8f1632168f 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c @@ -387,7 +387,7 @@ static int rzg2l_csi2_mipi_link_enable(struct rzg2l_csi2 *csi2) rzg2l_csi2_write(csi2, CSI2nDTEL, 0xf778ff0f); rzg2l_csi2_write(csi2, CSI2nDTEH, 0x00ffff1f); - clk_disable_unprepare(csi2->vclk); + clk_disable_unprepare_sync(csi2->vclk); /* Enable LINK reception */ rzg2l_csi2_write(csi2, CSI2nMCT3, CSI2nMCT3_RXEN);