diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-01 11:52:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-01 11:52:27 -0800 |
| commit | fafbad4a201e16c3213d595abda110d5e4261825 (patch) | |
| tree | ccb8c6a2dfb74994f813b4dfcfb62a5d9e661797 | |
| parent | 2bbb54ba1bf73d0f7db0d218731db721199e0db0 (diff) | |
| parent | 2a93c6cbd5a703d44c414a3c3945a87ce11430ba (diff) | |
| download | lwn-fafbad4a201e16c3213d595abda110d5e4261825.tar.gz lwn-fafbad4a201e16c3213d595abda110d5e4261825.zip | |
Merge tag 'pmdomain-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain fixes from Ulf Hansson:
- qcom: Fix enabled_corner aggregation for rpmhpd
- arm: Fix NULL dereference on scmi_perf_domain removal
* tag 'pmdomain-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
pmdomain: qcom: rpmhpd: Fix enabled_corner aggregation
pmdomain: arm: Fix NULL dereference on scmi_perf_domain removal
| -rw-r--r-- | drivers/pmdomain/arm/scmi_perf_domain.c | 3 | ||||
| -rw-r--r-- | drivers/pmdomain/qcom/rpmhpd.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pmdomain/arm/scmi_perf_domain.c b/drivers/pmdomain/arm/scmi_perf_domain.c index 709bbc448fad..d7ef46ccd9b8 100644 --- a/drivers/pmdomain/arm/scmi_perf_domain.c +++ b/drivers/pmdomain/arm/scmi_perf_domain.c @@ -159,6 +159,9 @@ static void scmi_perf_domain_remove(struct scmi_device *sdev) struct genpd_onecell_data *scmi_pd_data = dev_get_drvdata(dev); int i; + if (!scmi_pd_data) + return; + of_genpd_del_provider(dev->of_node); for (i = 0; i < scmi_pd_data->num_domains; i++) diff --git a/drivers/pmdomain/qcom/rpmhpd.c b/drivers/pmdomain/qcom/rpmhpd.c index 3078896b1300..47df910645f6 100644 --- a/drivers/pmdomain/qcom/rpmhpd.c +++ b/drivers/pmdomain/qcom/rpmhpd.c @@ -692,6 +692,7 @@ static int rpmhpd_aggregate_corner(struct rpmhpd *pd, unsigned int corner) unsigned int active_corner, sleep_corner; unsigned int this_active_corner = 0, this_sleep_corner = 0; unsigned int peer_active_corner = 0, peer_sleep_corner = 0; + unsigned int peer_enabled_corner; if (pd->state_synced) { to_active_sleep(pd, corner, &this_active_corner, &this_sleep_corner); @@ -701,9 +702,11 @@ static int rpmhpd_aggregate_corner(struct rpmhpd *pd, unsigned int corner) this_sleep_corner = pd->level_count - 1; } - if (peer && peer->enabled) - to_active_sleep(peer, peer->corner, &peer_active_corner, + if (peer && peer->enabled) { + peer_enabled_corner = max(peer->corner, peer->enable_corner); + to_active_sleep(peer, peer_enabled_corner, &peer_active_corner, &peer_sleep_corner); + } active_corner = max(this_active_corner, peer_active_corner); |