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

Commit 2a82b470 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: arm64: disable ENERGY_MODEL for kona"

parents 60a8a6be e03ff943

arch/arm64/configs/vendor/kona-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_PM_AUTOSLEEP=y 
CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_ENERGY_MODEL=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_CPU_FREQ=y

arch/arm64/configs/vendor/kona_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ CONFIG_PM_WAKELOCKS=y 
CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM_DEBUG=y

CONFIG_ENERGY_MODEL=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_CPU_FREQ=y

kernel/sched/walt.c

+2 −0
Original line number Diff line number Diff line
@@ -2943,6 +2943,7 @@ unsigned long thermal_cap(int cpu) 
unsigned long do_thermal_cap(int cpu, unsigned long thermal_max_freq)

{

	struct rq *rq = cpu_rq(cpu);

#ifdef CONFIG_ENERGY_MODEL

	int nr_cap_states;

	struct root_domain *rd = rq->rd;

	struct perf_domain *pd;
@@ -2964,6 +2965,7 @@ unsigned long do_thermal_cap(int cpu, unsigned long thermal_max_freq) 
					cpu_max_table_freq[cpu]);

		rcu_read_unlock();

	}

#endif



	if (cpu_max_table_freq[cpu])

		return div64_ul(thermal_max_freq * max_cap[cpu],