Commit ff1ccf59 authored by Douglas Anderson's avatar Douglas Anderson Committed by Bjorn Andersson

clk: qcom: lpass-sc7180: Fix pm_runtime usage

The sc7180 lpass clock controller's pm_runtime usage wasn't broken
quite as spectacularly as the sc7280's pm_runtime usage, but it was
still broken. Putting some printouts in at boot showed me this (with
serial console enabled, which makes the prints slow and thus changes
timing):
  [    3.109951] DOUG: my_pm_clk_resume, usage=1
  [    3.114767] DOUG: my_pm_clk_resume, usage=1
  [    3.664443] DOUG: my_pm_clk_suspend, usage=0
  [    3.897566] DOUG: my_pm_clk_suspend, usage=0
  [    3.910137] DOUG: my_pm_clk_resume, usage=1
  [    3.923217] DOUG: my_pm_clk_resume, usage=0
  [    4.440116] DOUG: my_pm_clk_suspend, usage=-1
  [    4.444982] DOUG: my_pm_clk_suspend, usage=0
  [   14.170501] DOUG: my_pm_clk_resume, usage=1
  [   14.176245] DOUG: my_pm_clk_resume, usage=0

...or this w/out serial console:
  [    0.556139] DOUG: my_pm_clk_resume, usage=1
  [    0.556279] DOUG: my_pm_clk_resume, usage=1
  [    1.058422] DOUG: my_pm_clk_suspend, usage=-1
  [    1.058464] DOUG: my_pm_clk_suspend, usage=0
  [    1.186250] DOUG: my_pm_clk_resume, usage=1
  [    1.186292] DOUG: my_pm_clk_resume, usage=0
  [    1.731536] DOUG: my_pm_clk_suspend, usage=-1
  [    1.731557] DOUG: my_pm_clk_suspend, usage=0
  [   10.288910] DOUG: my_pm_clk_resume, usage=1
  [   10.289496] DOUG: my_pm_clk_resume, usage=0

It seems to be doing roughly the right sequence of calls, but just
like with sc7280 this is more by luck than anything. Having a usage of
-1 is just not OK.

Let's fix this like we did with sc7280.
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Fixes: ce8c195e ("clk: qcom: lpasscc: Introduce pm autosuspend for SC7180")
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221104064055.2.I49b25b9bda9430fc7ea21e5a708ca5a0aced2798@changeid
parent d470be3c
...@@ -356,7 +356,7 @@ static const struct qcom_cc_desc lpass_audio_hm_sc7180_desc = { ...@@ -356,7 +356,7 @@ static const struct qcom_cc_desc lpass_audio_hm_sc7180_desc = {
.num_gdscs = ARRAY_SIZE(lpass_audio_hm_sc7180_gdscs), .num_gdscs = ARRAY_SIZE(lpass_audio_hm_sc7180_gdscs),
}; };
static int lpass_create_pm_clks(struct platform_device *pdev) static int lpass_setup_runtime_pm(struct platform_device *pdev)
{ {
int ret; int ret;
...@@ -375,7 +375,7 @@ static int lpass_create_pm_clks(struct platform_device *pdev) ...@@ -375,7 +375,7 @@ static int lpass_create_pm_clks(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
dev_err(&pdev->dev, "failed to acquire iface clock\n"); dev_err(&pdev->dev, "failed to acquire iface clock\n");
return ret; return pm_runtime_resume_and_get(&pdev->dev);
} }
static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) static int lpass_core_cc_sc7180_probe(struct platform_device *pdev)
...@@ -384,7 +384,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) ...@@ -384,7 +384,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev)
struct regmap *regmap; struct regmap *regmap;
int ret; int ret;
ret = lpass_create_pm_clks(pdev); ret = lpass_setup_runtime_pm(pdev);
if (ret) if (ret)
return ret; return ret;
...@@ -392,12 +392,14 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) ...@@ -392,12 +392,14 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev)
desc = &lpass_audio_hm_sc7180_desc; desc = &lpass_audio_hm_sc7180_desc;
ret = qcom_cc_probe_by_index(pdev, 1, desc); ret = qcom_cc_probe_by_index(pdev, 1, desc);
if (ret) if (ret)
return ret; goto exit;
lpass_core_cc_sc7180_regmap_config.name = "lpass_core_cc"; lpass_core_cc_sc7180_regmap_config.name = "lpass_core_cc";
regmap = qcom_cc_map(pdev, &lpass_core_cc_sc7180_desc); regmap = qcom_cc_map(pdev, &lpass_core_cc_sc7180_desc);
if (IS_ERR(regmap)) if (IS_ERR(regmap)) {
return PTR_ERR(regmap); ret = PTR_ERR(regmap);
goto exit;
}
/* /*
* Keep the CLK always-ON * Keep the CLK always-ON
...@@ -415,6 +417,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) ...@@ -415,6 +417,7 @@ static int lpass_core_cc_sc7180_probe(struct platform_device *pdev)
ret = qcom_cc_really_probe(pdev, &lpass_core_cc_sc7180_desc, regmap); ret = qcom_cc_really_probe(pdev, &lpass_core_cc_sc7180_desc, regmap);
pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_mark_last_busy(&pdev->dev);
exit:
pm_runtime_put_autosuspend(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev);
return ret; return ret;
...@@ -425,14 +428,19 @@ static int lpass_hm_core_probe(struct platform_device *pdev) ...@@ -425,14 +428,19 @@ static int lpass_hm_core_probe(struct platform_device *pdev)
const struct qcom_cc_desc *desc; const struct qcom_cc_desc *desc;
int ret; int ret;
ret = lpass_create_pm_clks(pdev); ret = lpass_setup_runtime_pm(pdev);
if (ret) if (ret)
return ret; return ret;
lpass_core_cc_sc7180_regmap_config.name = "lpass_hm_core"; lpass_core_cc_sc7180_regmap_config.name = "lpass_hm_core";
desc = &lpass_core_hm_sc7180_desc; desc = &lpass_core_hm_sc7180_desc;
return qcom_cc_probe_by_index(pdev, 0, desc); ret = qcom_cc_probe_by_index(pdev, 0, desc);
pm_runtime_mark_last_busy(&pdev->dev);
pm_runtime_put_autosuspend(&pdev->dev);
return ret;
} }
static const struct of_device_id lpass_hm_sc7180_match_table[] = { static const struct of_device_id lpass_hm_sc7180_match_table[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment