Skip to content

msm8917: fix cpuidle #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barni2000 merged 2 commits into from
Feb 5, 2025
Merged

msm8917: fix cpuidle #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c4c85f
psci: Allow forcing PSCI domains
alikates Dec 19, 2022
5f1929d
arm64: dts: qcom: msm8917: fix cpu idle states
valpackett Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Documentation/devicetree/bindings/arm/psci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ properties:
[1] Kernel documentation - ARM idle states bindings
Documentation/devicetree/bindings/cpu/idle-states.yaml

force-psci-domains:
$ref: /schemas/types.yaml#/definitions/flag
description: |
Force using PSCI power domains. This skips setting OSI mode because it's
already enabled by the firmware and cannot be changed.
Relevant for some legacy Qualcomm SoCs.

patternProperties:
"^power-domain-":
$ref: /schemas/power/power-domain.yaml#
Expand Down
28 changes: 22 additions & 6 deletions arch/arm64/boot/dts/qcom/msm8917.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,27 @@
};

domain-idle-states {
cluster_sleep_0: cluster-sleep-0 {
/* Seems strange, but downstream msm8917-pm.dtsi specifies
GHDS as faster than retention, unlike for other SoCs */

cluster_gdhs: cluster-gdhs {
compatible = "domain-idle-state";
idle-state-name = "cluster-gdhs";
arm,psci-suspend-param = <0x41000043>;
entry-latency-us = <150>;
exit-latency-us = <280>;
min-residency-us = <560>;
local-timer-stop;
};

cluster_ret: cluster-retention {
compatible = "domain-idle-state";
arm,psci-suspend-param = <0x41000053>;
entry-latency-us = <700>;
exit-latency-us = <1000>;
min-residency-us = <6500>;
idle-state-name = "cluster-ret";
arm,psci-suspend-param = <0x41000033>;
entry-latency-us = <120>;
exit-latency-us = <650>;
min-residency-us = <1300>;
local-timer-stop;
};
};

Expand Down Expand Up @@ -185,10 +200,11 @@
psci {
compatible = "arm,psci-1.0";
method = "smc";
force-psci-domains;

cluster_pd: power-domain-cluster {
#power-domain-cells = <0>;
domain-idle-states = <&cluster_sleep_0>;
domain-idle-states = <&cluster_gdhs>, <&cluster_ret>;
};

cpu_pd0: power-domain-cpu0 {
Expand Down
19 changes: 13 additions & 6 deletions drivers/cpuidle/cpuidle-psci-domain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
bool use_osi = psci_has_osi_support();
bool force_psci_domains;
int ret = 0, pd_count = 0;

if (!np)
return -ENODEV;


/*
* Parse child nodes for the "#power-domain-cells" property and
* initialize a genpd/genpd-of-provider pair when it's found.
Expand All @@ -172,13 +174,18 @@ static int psci_cpuidle_domain_probe(struct platform_device *pdev)
if (ret)
goto remove_pd;

/* let's try to enable OSI. */
ret = psci_set_osi_mode(use_osi);
if (ret)
goto remove_pd;
force_psci_domains = of_property_read_bool(np, "force-psci-domains");

if (!force_psci_domains) {
/* let's try to enable OSI. */
ret = psci_set_osi_mode(use_osi);
if (ret)
goto remove_pd;

pr_info("Initialized CPU PM domain topology using %s mode\n",
use_osi ? "OSI" : "PC");
}

pr_info("Initialized CPU PM domain topology using %s mode\n",
use_osi ? "OSI" : "PC");
return 0;

remove_pd:
Expand Down