Commit fafbad4a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2bbb54ba 2a93c6cb

drivers/pmdomain/arm/scmi_perf_domain.c

+3 −0
Original line number Diff line number Diff line
@@ -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++)

drivers/pmdomain/qcom/rpmhpd.c

+5 −2
Original line number Diff line number Diff line
@@ -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);