From patchwork Tue Dec 27 20:45:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13082516 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0173DC46467 for ; Tue, 27 Dec 2022 21:03:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232614AbiL0VDM (ORCPT ); Tue, 27 Dec 2022 16:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229579AbiL0VCw (ORCPT ); Tue, 27 Dec 2022 16:02:52 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E11C1004 for ; Tue, 27 Dec 2022 12:45:51 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id bk16so136395wrb.11 for ; Tue, 27 Dec 2022 12:45:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jMtSkf5GA9IYjK1JZDsDiUsv6BKdatljycze6k+PiwQ=; b=xVzN0pGT5vPr+EDCy/QndegBqTaNSMs7ICo2xVWwFO4b+XsbbQQzzPOkbP4GmmWaPh MFjOQuO/cTR00OKiG/6Cusnyp5AmUrG8LpmMsK4fEabbC7gjEnXg5hzFGOojYRA5T5YY uVaNoJRyXe5UznjAChgWMi3ZC34yFv+nW3r6A0jgdH7ac/aJLyN/aEbyvIgAstUsD9DW KWrBjWvaniWZDRtNFjBRJKIfVgGIHGVw/ahro0QRETdixepp2rLXUbjQg764CAkfDxpO EYjZ/tQlUe9N+Go8/14yTGey4hy915iLlF4Hl/iY+Lk1KFawJWKhWwBwktQJZ1RYMSXA 397w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jMtSkf5GA9IYjK1JZDsDiUsv6BKdatljycze6k+PiwQ=; b=h4IGTj/SseYpoVuKTG1yE9fyrtKzZZ2SH6YEjIcZ6ZOnryGhqluYXACV3zvQ8sFCZD 5p8PMAWzqBcrXe6FQM70pv8+nspr/kBl114UGn5zt/3WxjKDw9daANTMUDU4nTTMPllO OqEh6hpkwOFQBjM0Ch0v/Nv9pUL3cnct1gcECJTOy8pvWYvyedDuOXcGTf4tMPrzPDru iDd4Yfi6XEH1iu8f4eetmOot1L31hb9Rbn9UjiSRsxrCKkpmjsYw4ix0Bg8INz4lVVrH 9NW4EYKBa5V8T7Ynq1pIVBJV/x83bJM/jbp8QhPErmWE/B0urOBlm3XgPmGAAnZJrcDe GEtw== X-Gm-Message-State: AFqh2krU/1LYme1Iasaj1PmpnImCApgMmz18ouC2CyM5V8o6JZEZ45i9 zVF7yDTaMkljjxdVdFRCOBHtLfY3VFQfScCJ X-Google-Smtp-Source: AMrXdXsnIs5gGXrna/oO8N55xD3o+MGahUcpJ5ut0xi4Q5UceyDaLi5BqdGvMWvO9tncnlj5bGfVwg== X-Received: by 2002:adf:e38e:0:b0:242:137d:9ce8 with SMTP id e14-20020adfe38e000000b00242137d9ce8mr13218151wrm.9.1672173949777; Tue, 27 Dec 2022 12:45:49 -0800 (PST) Received: from hackbox.lan ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id m17-20020a056000181100b002422202fa7fsm13337571wrh.39.2022.12.27.12.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 12:45:49 -0800 (PST) From: Abel Vesa To: Mike Turquette , Stephen Boyd , Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Baryshkov Cc: linux-clk@vger.kernel.org, Linux Kernel Mailing List , linux-arm-msm@vger.kernel.org Subject: [PATCH v3 1/2] clk: Add generic sync_state callback for disabling unused clocks Date: Tue, 27 Dec 2022 22:45:27 +0200 Message-Id: <20221227204528.1899863-1-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There are unused clocks that need to remain untouched by clk_disable_unused, and most likely could be disabled later on sync_state. So provide a generic sync_state callback for the clock providers that register such clocks. Then, use the same mechanism as clk_disable_unused from that generic callback, but pass the device to make sure only the clocks belonging to the current clock provider get disabled, if unused. Also, during the default clk_disable_unused, if the driver that registered the clock has the generic clk_sync_state_disable_unused callback set for sync_state, skip disabling its clocks. Signed-off-by: Abel Vesa Reviewed-by: Dmitry Baryshkov Reviewed-by: Bjorn Andersson --- Changes since v2: * dropped the check for sync_state callback (clk_sync_state_disable_unused), like Dmitry suggested drivers/clk/clk.c | 57 +++++++++++++++++++++++++++++------- include/linux/clk-provider.h | 1 + 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e62552a75f08..ac7182903d88 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1302,14 +1302,26 @@ static void clk_core_disable_unprepare(struct clk_core *core) clk_core_unprepare_lock(core); } -static void __init clk_unprepare_unused_subtree(struct clk_core *core) +static void clk_unprepare_unused_subtree(struct clk_core *core, + struct device *dev) { + bool from_sync_state = !!dev; struct clk_core *child; lockdep_assert_held(&prepare_lock); hlist_for_each_entry(child, &core->children, child_node) - clk_unprepare_unused_subtree(child); + clk_unprepare_unused_subtree(child, dev); + + if (from_sync_state && core->dev != dev) + return; + + /* + * clock will be unprepared on sync_state, + * so leave as is for now + */ + if (!from_sync_state && dev_has_sync_state(core->dev)) + return; if (core->prepare_count) return; @@ -1332,15 +1344,27 @@ static void __init clk_unprepare_unused_subtree(struct clk_core *core) clk_pm_runtime_put(core); } -static void __init clk_disable_unused_subtree(struct clk_core *core) +static void clk_disable_unused_subtree(struct clk_core *core, + struct device *dev) { + bool from_sync_state = !!dev; struct clk_core *child; unsigned long flags; lockdep_assert_held(&prepare_lock); hlist_for_each_entry(child, &core->children, child_node) - clk_disable_unused_subtree(child); + clk_disable_unused_subtree(child, dev); + + if (from_sync_state && core->dev != dev) + return; + + /* + * clock will be disabled on sync_state, + * so leave as is for now + */ + if (!from_sync_state && dev_has_sync_state(core->dev)) + return; if (core->flags & CLK_OPS_PARENT_ENABLE) clk_core_prepare_enable(core->parent); @@ -1378,7 +1402,7 @@ static void __init clk_disable_unused_subtree(struct clk_core *core) clk_core_disable_unprepare(core->parent); } -static bool clk_ignore_unused __initdata; +static bool clk_ignore_unused; static int __init clk_ignore_unused_setup(char *__unused) { clk_ignore_unused = true; @@ -1386,35 +1410,46 @@ static int __init clk_ignore_unused_setup(char *__unused) } __setup("clk_ignore_unused", clk_ignore_unused_setup); -static int __init clk_disable_unused(void) +static void __clk_disable_unused(struct device *dev) { struct clk_core *core; if (clk_ignore_unused) { pr_warn("clk: Not disabling unused clocks\n"); - return 0; + return; } clk_prepare_lock(); hlist_for_each_entry(core, &clk_root_list, child_node) - clk_disable_unused_subtree(core); + clk_disable_unused_subtree(core, dev); hlist_for_each_entry(core, &clk_orphan_list, child_node) - clk_disable_unused_subtree(core); + clk_disable_unused_subtree(core, dev); hlist_for_each_entry(core, &clk_root_list, child_node) - clk_unprepare_unused_subtree(core); + clk_unprepare_unused_subtree(core, dev); hlist_for_each_entry(core, &clk_orphan_list, child_node) - clk_unprepare_unused_subtree(core); + clk_unprepare_unused_subtree(core, dev); clk_prepare_unlock(); +} + +static int __init clk_disable_unused(void) +{ + __clk_disable_unused(NULL); return 0; } late_initcall_sync(clk_disable_unused); +void clk_sync_state_disable_unused(struct device *dev) +{ + __clk_disable_unused(dev); +} +EXPORT_SYMBOL_GPL(clk_sync_state_disable_unused); + static int clk_core_determine_round_nolock(struct clk_core *core, struct clk_rate_request *req) { diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 842e72a5348f..cf1adfeaf257 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -720,6 +720,7 @@ struct clk *clk_register_divider_table(struct device *dev, const char *name, void __iomem *reg, u8 shift, u8 width, u8 clk_divider_flags, const struct clk_div_table *table, spinlock_t *lock); +void clk_sync_state_disable_unused(struct device *dev); /** * clk_register_divider - register a divider clock with the clock framework * @dev: device registering this clock From patchwork Tue Dec 27 20:45:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 13082517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CB3BC4708E for ; Tue, 27 Dec 2022 21:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232523AbiL0VDN (ORCPT ); Tue, 27 Dec 2022 16:03:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230129AbiL0VCx (ORCPT ); Tue, 27 Dec 2022 16:02:53 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A9EEB49C for ; Tue, 27 Dec 2022 12:45:52 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id bs20so11248257wrb.3 for ; Tue, 27 Dec 2022 12:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=zataCZGEzQIAuQApeyUtcsVZkc4oA8sa1m255NDvRGY=; b=zrVy+kKkbz9k1gsIjjuRvlbDyNo3WywOnyq/Bd5HmBHXViEkk5VorO2rz4R6ZY1+E7 UXG9zp2Z9zYWZknHFC5c9fHxxpfTMGkR1jDoRZVJkkRuS+xwWOh1DCUzNasCPLvQjJab ixsRbPuaWdO9IYwY71YkIwGEI84gMdn4PEia9/lbUX4o7DM0svZvSTXDuik/uiawgTJY S33Twkj/Ez7Kkep9FCkrXbvXmf64HqGKD5sK8EW+DvGTim86r4+jf+v4MnOtqWrplRuM CneoczR9eT+AW4Q6mkulZ1m6ewySzi48RUxq3lXaYxY4aQ2myq1MTdjFomL7+zQ1ZDRd dMwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zataCZGEzQIAuQApeyUtcsVZkc4oA8sa1m255NDvRGY=; b=6sHwjVhl93QGdeub+X8nBGXWOlZUuHu1vEmFl/bMAuAYrPdg4TiyS+NGoqayXa3oZ2 Z5EZELDW+dRR3HKsHC4H0BK36zkv27pAteGQoxYWHe89ZbdZ2X4UJEah/NXWQXNbR0As Om5dyGLrSEinN75oSy1igr/TIGjCEclTvHYfZoHTUi1LyNwAVyVVE4a9TqWJrrpiJtca qpH9+tIn0ionVOxo8Kzr8ueE0rnHoGvVPWwT3Ccw1gvOgCywXsPF/XD24iDvfJ6bKPHQ H3BY4LRAr7Tl4ON8TvxUJGYEysJDD2u+LUy/sbdGWytYCk8BDphWRHK7J2xjzFtP2GCY bzjg== X-Gm-Message-State: AFqh2koUj36kqPaMySTESLkW+xpVd0wjiIM/FRBFdci9EKZw9sZ4m48C Cr73MKF9zry9iPcsHK7kD2rCyA== X-Google-Smtp-Source: AMrXdXvw6E/fLU4LrJLmKH1UOGgO5Vz2JoGtDvSOIeozEguWKgqjDyaSOskWVkAo7gkJ+8gN9Au1Qw== X-Received: by 2002:a5d:4008:0:b0:242:7214:55e4 with SMTP id n8-20020a5d4008000000b00242721455e4mr13903988wrp.46.1672173950914; Tue, 27 Dec 2022 12:45:50 -0800 (PST) Received: from hackbox.lan ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id m17-20020a056000181100b002422202fa7fsm13337571wrh.39.2022.12.27.12.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 12:45:50 -0800 (PST) From: Abel Vesa To: Mike Turquette , Stephen Boyd , Andy Gross , Bjorn Andersson , Konrad Dybcio , Dmitry Baryshkov Cc: linux-clk@vger.kernel.org, Linux Kernel Mailing List , linux-arm-msm@vger.kernel.org Subject: [PATCH v3 2/2] clk: qcom: sdm845: Use generic clk_sync_state_disable_unused callback Date: Tue, 27 Dec 2022 22:45:28 +0200 Message-Id: <20221227204528.1899863-2-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221227204528.1899863-1-abel.vesa@linaro.org> References: <20221227204528.1899863-1-abel.vesa@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org By adding the newly added clk_sync_state_disable_unused as sync_state callback to all sdm845 clock providers, we make sure that no clock belonging to these providers gets disabled on clk_disable_unused, but rather they are disabled on sync_state, when it is safe, since all the consumers build as modules have had their chance of enabling their own clocks. Signed-off-by: Abel Vesa Reviewed-by: Bjorn Andersson Reviewed-by: Dmitry Baryshkov --- Changes since v2: * None drivers/clk/qcom/camcc-sdm845.c | 1 + drivers/clk/qcom/dispcc-sdm845.c | 1 + drivers/clk/qcom/gcc-sdm845.c | 1 + drivers/clk/qcom/gpucc-sdm845.c | 1 + 4 files changed, 4 insertions(+) diff --git a/drivers/clk/qcom/camcc-sdm845.c b/drivers/clk/qcom/camcc-sdm845.c index 27d44188a7ab..e5aeb832e47b 100644 --- a/drivers/clk/qcom/camcc-sdm845.c +++ b/drivers/clk/qcom/camcc-sdm845.c @@ -1743,6 +1743,7 @@ static struct platform_driver cam_cc_sdm845_driver = { .driver = { .name = "sdm845-camcc", .of_match_table = cam_cc_sdm845_match_table, + .sync_state = clk_sync_state_disable_unused, }, }; diff --git a/drivers/clk/qcom/dispcc-sdm845.c b/drivers/clk/qcom/dispcc-sdm845.c index 735adfefc379..1810d58bad09 100644 --- a/drivers/clk/qcom/dispcc-sdm845.c +++ b/drivers/clk/qcom/dispcc-sdm845.c @@ -869,6 +869,7 @@ static struct platform_driver disp_cc_sdm845_driver = { .driver = { .name = "disp_cc-sdm845", .of_match_table = disp_cc_sdm845_match_table, + .sync_state = clk_sync_state_disable_unused, }, }; diff --git a/drivers/clk/qcom/gcc-sdm845.c b/drivers/clk/qcom/gcc-sdm845.c index 6af08e0ca847..0ff05af515c4 100644 --- a/drivers/clk/qcom/gcc-sdm845.c +++ b/drivers/clk/qcom/gcc-sdm845.c @@ -4020,6 +4020,7 @@ static struct platform_driver gcc_sdm845_driver = { .driver = { .name = "gcc-sdm845", .of_match_table = gcc_sdm845_match_table, + .sync_state = clk_sync_state_disable_unused, }, }; diff --git a/drivers/clk/qcom/gpucc-sdm845.c b/drivers/clk/qcom/gpucc-sdm845.c index 110b54401bc6..622a54a67d32 100644 --- a/drivers/clk/qcom/gpucc-sdm845.c +++ b/drivers/clk/qcom/gpucc-sdm845.c @@ -205,6 +205,7 @@ static struct platform_driver gpu_cc_sdm845_driver = { .driver = { .name = "sdm845-gpucc", .of_match_table = gpu_cc_sdm845_match_table, + .sync_state = clk_sync_state_disable_unused, }, };