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

Commit 81be193b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq-fixes' 

* pm-cpufreq-fixes:
  cpufreq: intel_pstate: Fix processing for turbo activation ratio
  Revert "cpufreq: governor: Fix negative idle_time when configured with CONFIG_HZ_PERIODIC"
parents 02da2d72 1becf035

drivers/cpufreq/cpufreq_governor.c

+2 −6
Original line number Diff line number Diff line
@@ -193,12 +193,8 @@ unsigned int dbs_update(struct cpufreq_policy *policy) 
		wall_time = cur_wall_time - j_cdbs->prev_cpu_wall;

		j_cdbs->prev_cpu_wall = cur_wall_time;



		if (cur_idle_time <= j_cdbs->prev_cpu_idle) {

			idle_time = 0;

		} else {

		idle_time = cur_idle_time - j_cdbs->prev_cpu_idle;

		j_cdbs->prev_cpu_idle = cur_idle_time;

		}



		if (ignore_nice) {

			u64 cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];

drivers/cpufreq/intel_pstate.c

+5 −0
Original line number Diff line number Diff line
@@ -813,6 +813,11 @@ static int core_get_max_pstate(void) 
			if (err)

				goto skip_tar;



			/* For level 1 and 2, bits[23:16] contain the ratio */

			if (tdp_ctrl)

				tdp_ratio >>= 16;



			tdp_ratio &= 0xff; /* ratios are only 8 bits long */

			if (tdp_ratio - 1 == tar) {

				max_pstate = tar;

				pr_debug("max_pstate=TAC %x\n", max_pstate);