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

Commit e3765a4b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'dev/msm-4.9-sched' into msm-4.9"

parents ef2396c5 93b3f0f6

arch/arm/include/asm/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ unsigned long arch_get_cpu_efficiency(int cpu); 


#ifdef CONFIG_CPU_FREQ

#define arch_scale_freq_capacity cpufreq_scale_freq_capacity

#define arch_scale_max_freq_capacity cpufreq_scale_max_freq_capacity

#define arch_scale_min_freq_capacity cpufreq_scale_min_freq_capacity

#endif

#define arch_scale_cpu_capacity scale_cpu_capacity

extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu);

arch/arm/kernel/topology.c

+0 −6
Original line number Diff line number Diff line
@@ -55,13 +55,7 @@ static void set_power_scale(unsigned int cpu, unsigned long power) 


unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu)

{

#ifdef CONFIG_CPU_FREQ

	unsigned long max_freq_scale = cpufreq_scale_max_freq_capacity(cpu);



	return per_cpu(cpu_scale, cpu) * max_freq_scale >> SCHED_CAPACITY_SHIFT;

#else

	return per_cpu(cpu_scale, cpu);

#endif

}



static void set_capacity_scale(unsigned int cpu, unsigned long capacity)

arch/arm64/boot/dts/qcom/sdm845-v2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ 
			1766400 160

		>;

		idle-cost-data = <

			22 18 14 12

			10 8 6 4

		>;

	};

	CPU_COST_1: core-cost1 {

arch/arm64/include/asm/topology.h

+4 −1
Original line number Diff line number Diff line
@@ -36,7 +36,10 @@ struct sched_domain; 
#ifdef CONFIG_CPU_FREQ

#define arch_scale_freq_capacity cpufreq_scale_freq_capacity

extern unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu);

extern unsigned long cpufreq_scale_max_freq_capacity(int cpu);

#define arch_scale_max_freq_capacity cpufreq_scale_max_freq_capacity

extern unsigned long cpufreq_scale_max_freq_capacity(struct sched_domain *sd, int cpu);

#define arch_scale_min_freq_capacity cpufreq_scale_min_freq_capacity

extern unsigned long cpufreq_scale_min_freq_capacity(struct sched_domain *sd, int cpu);

#endif

#define arch_scale_cpu_capacity scale_cpu_capacity

extern unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu);

arch/arm64/kernel/topology.c

+0 −6
Original line number Diff line number Diff line
@@ -50,13 +50,7 @@ static void set_power_scale(unsigned int cpu, unsigned long power) 


unsigned long scale_cpu_capacity(struct sched_domain *sd, int cpu)

{

#ifdef CONFIG_CPU_FREQ

	unsigned long max_freq_scale = cpufreq_scale_max_freq_capacity(cpu);



	return per_cpu(cpu_scale, cpu) * max_freq_scale >> SCHED_CAPACITY_SHIFT;

#else

	return per_cpu(cpu_scale, cpu);

#endif

}



static void set_capacity_scale(unsigned int cpu, unsigned long capacity)