Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b00992f4 authored by Puja Gupta's avatar Puja Gupta
Browse files

ANDROID: Move energy model init call into arch_topology driver 



Now that we decouple the Energy Model (EM) from the cpu_scale
calculation, initialize the EM after the cpu_scale calaculation
has finished.

Change-Id: I7f0fc3bed84dddb12f06d401527df2c33097a281
Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Git-commit: 4063b5fbcb32366851acda795e3611abdd2241b0
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: default avatarPuja Gupta <pujag@codeaurora.org>
parent f24bd3dc

arch/arm/kernel/topology.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -349,6 +349,4 @@ void __init init_cpu_topology(void) 




	/* Set scheduler topology descriptor */

	/* Set scheduler topology descriptor */

	set_sched_topology(arm_topology);

	set_sched_topology(arm_topology);



	init_sched_energy_costs();

}
 
}

arch/arm64/kernel/topology.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -188,8 +188,6 @@ static int __init parse_dt_topology(void) 
	if (!map)

	if (!map)

		goto out;

		goto out;





	init_sched_energy_costs();



	ret = parse_cluster(map, 0);

	ret = parse_cluster(map, 0);

	if (ret != 0)

	if (ret != 0)

		goto out_map;

		goto out_map;

drivers/base/arch_topology.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -422,6 +422,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, 




	if (cpumask_empty(cpus_to_visit)) {

	if (cpumask_empty(cpus_to_visit)) {

		topology_normalize_cpu_scale();

		topology_normalize_cpu_scale();

		init_sched_energy_costs();

		if (topology_detect_flags())

		if (topology_detect_flags())

			schedule_work(&update_topology_flags_work);

			schedule_work(&update_topology_flags_work);

		free_raw_capacity();

		free_raw_capacity();