| Message ID | 20230717-topic-branch_aon_cleanup-v3-4-3e31bce9c626@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Unregister critical branch clocks + some RPM | expand |
On Wed, Dec 20, 2023 at 01:30:45AM +0100, Konrad Dybcio wrote: > The GCC block on SM6375 is powered by the VDD_CX rail. We need to ensure > that CX is enabled to prevent unwanted power collapse As I pointed out earlier, this bit of the commit message is incorrect and misleading as the power domain will never be disabled until you enable runtime PM as part of this very patch: https://lore.kernel.org/all/ZLaSpFFBzP_Yz5yY@hovoldconsulting.com/ Specifically, genpd will not power off CX (at runtime) while the driver is bound when runtime PM is left disabled. > and that the > reference is dropped when unused so that the system can enter a > firmware-managed lower power state. > > Enable runtime PM to keep the power flowing only when necessary. The rest is correct. Johan
On 20.12.2023 10:26, Johan Hovold wrote: > On Wed, Dec 20, 2023 at 01:30:45AM +0100, Konrad Dybcio wrote: >> The GCC block on SM6375 is powered by the VDD_CX rail. We need to ensure >> that CX is enabled to prevent unwanted power collapse > > As I pointed out earlier, this bit of the commit message is incorrect > and misleading as the power domain will never be disabled until you > enable runtime PM as part of this very patch: > > https://lore.kernel.org/all/ZLaSpFFBzP_Yz5yY@hovoldconsulting.com/ > > Specifically, genpd will not power off CX (at runtime) while the driver > is bound when runtime PM is left disabled. OK I only now see what you really meant. What this bit says is true, but it may be confusing within the context of this patch. The CX domain must be turned on [for the SoC to function], however this patch does not solve the issue of it being powered down [like you've said just binding the PD will keep it always-active for RPM-disabled devices]. It complements this process, by allowing it to shut down when unnecessary. > >> and that the >> reference is dropped when unused so that the system can enter a >> firmware-managed lower power state. >> >> Enable runtime PM to keep the power flowing only when necessary. > > The rest is correct. Let me try to reword this and see if you like it: The GCC block on SM6375 is powered by the VDD_CX rail. The Device Tree description of this dependency lets Linux keep the rail online to prevent power outages. It is however undesirable to keep it enabled at all times, as that consumes additional power. Moreover, failing to drop the "enabled" vote prevents firmware-managed, SoC-wide power collapse in suspend, which leads to even more wasted power. Enable runtime PM to keep the power flowing only when necessary. Konrad
diff --git a/drivers/clk/qcom/gcc-sm6375.c b/drivers/clk/qcom/gcc-sm6375.c index 44c74e74885f..dff0b2f20759 100644 --- a/drivers/clk/qcom/gcc-sm6375.c +++ b/drivers/clk/qcom/gcc-sm6375.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <dt-bindings/clock/qcom,sm6375-gcc.h> @@ -3785,13 +3786,25 @@ static int gcc_sm6375_probe(struct platform_device *pdev) struct regmap *regmap; int ret; + ret = devm_pm_runtime_enable(&pdev->dev); + if (ret) + return ret; + + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + regmap = qcom_cc_map(pdev, &gcc_sm6375_desc); - if (IS_ERR(regmap)) + if (IS_ERR(regmap)) { + pm_runtime_put(&pdev->dev); return PTR_ERR(regmap); + } ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, ARRAY_SIZE(gcc_dfs_clocks)); - if (ret) + if (ret) { + pm_runtime_put(&pdev->dev); return ret; + } qcom_branch_set_clk_en(regmap, 0x17028); /* GCC_CAMERA_XO_CLK */ qcom_branch_set_clk_en(regmap, 0x2b004); /* GCC_CPUSS_GNOC_CLK */ @@ -3807,7 +3820,10 @@ static int gcc_sm6375_probe(struct platform_device *pdev) clk_lucid_pll_configure(&gpll8, regmap, &gpll8_config); clk_zonda_pll_configure(&gpll9, regmap, &gpll9_config); - return qcom_cc_really_probe(pdev, &gcc_sm6375_desc, regmap); + ret = qcom_cc_really_probe(pdev, &gcc_sm6375_desc, regmap); + pm_runtime_put(&pdev->dev); + + return ret; } static struct platform_driver gcc_sm6375_driver = {
The GCC block on SM6375 is powered by the VDD_CX rail. We need to ensure that CX is enabled to prevent unwanted power collapse and that the reference is dropped when unused so that the system can enter a firmware-managed lower power state. Enable runtime PM to keep the power flowing only when necessary. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/clk/qcom/gcc-sm6375.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)