Commit 0ce629b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These address three issues in the intel_pstate driver and fix two
  problems related to hibernation.

  Specifics:

   - Make intel_pstate work correctly on Ice Lake server systems with
     out-of-band performance control enabled (Adamos Ttofari).

   - Fix EPP handling in intel_pstate during CPU offline and online in
     the active mode (Rafael Wysocki).

   - Make intel_pstate support ITMT on asymmetric systems with
     overclocking enabled (Srinivas Pandruvada).

   - Fix hibernation image saving when using the user space interface
     based on the snapshot special device file (Evan Green).

   - Make the hibernation code release the snapshot block device using
     the same mode that was used when acquiring it (Thomas Zeitlhofer)"

* tag 'pm-5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: Fix snapshot partial write lengths
  PM: hibernate: use correct mode for swsusp_close()
  cpufreq: intel_pstate: ITMT support for overclocked system
  cpufreq: intel_pstate: Fix active mode offline/online EPP handling
  cpufreq: intel_pstate: Add Ice Lake server to out-of-band IDs
parents 925c9437 7803516d

drivers/cpufreq/intel_pstate.c

+17 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ static void intel_pstste_sched_itmt_work_fn(struct work_struct *work) 


static DECLARE_WORK(sched_itmt_work, intel_pstste_sched_itmt_work_fn);



#define CPPC_MAX_PERF	U8_MAX



static void intel_pstate_set_itmt_prio(int cpu)

{

	struct cppc_perf_caps cppc_perf;
@@ -348,6 +350,14 @@ static void intel_pstate_set_itmt_prio(int cpu) 
	if (ret)

		return;



	/*

	 * On some systems with overclocking enabled, CPPC.highest_perf is hardcoded to 0xff.

	 * In this case we can't use CPPC.highest_perf to enable ITMT.

	 * In this case we can look at MSR_HWP_CAPABILITIES bits [8:0] to decide.

	 */

	if (cppc_perf.highest_perf == CPPC_MAX_PERF)

		cppc_perf.highest_perf = HWP_HIGHEST_PERF(READ_ONCE(all_cpu_data[cpu]->hwp_cap_cached));



	/*

	 * The priorities can be set regardless of whether or not

	 * sched_set_itmt_support(true) has been called and it is valid to
@@ -1006,6 +1016,12 @@ static void intel_pstate_hwp_offline(struct cpudata *cpu) 
		 */

		value &= ~GENMASK_ULL(31, 24);

		value |= HWP_ENERGY_PERF_PREFERENCE(cpu->epp_cached);

		/*

		 * However, make sure that EPP will be set to "performance" when

		 * the CPU is brought back online again and the "performance"

		 * scaling algorithm is still in effect.

		 */

		cpu->epp_policy = CPUFREQ_POLICY_UNKNOWN;

	}



	/*
@@ -2353,6 +2369,7 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { 
	X86_MATCH(BROADWELL_D,		core_funcs),

	X86_MATCH(BROADWELL_X,		core_funcs),

	X86_MATCH(SKYLAKE_X,		core_funcs),

	X86_MATCH(ICELAKE_X,		core_funcs),

	{}

};

kernel/power/hibernate.c

+3 −3
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int load_image_and_restore(void) 
		goto Unlock;



	error = swsusp_read(&flags);

	swsusp_close(FMODE_READ);

	swsusp_close(FMODE_READ | FMODE_EXCL);

	if (!error)

		error = hibernation_restore(flags & SF_PLATFORM_MODE);
@@ -983,7 +983,7 @@ static int software_resume(void) 
	/* The snapshot device should not be opened while we're running */

	if (!hibernate_acquire()) {

		error = -EBUSY;

		swsusp_close(FMODE_READ);

		swsusp_close(FMODE_READ | FMODE_EXCL);

		goto Unlock;

	}
@@ -1018,7 +1018,7 @@ static int software_resume(void) 
	pm_pr_dbg("Hibernation image not present or could not be loaded.\n");

	return error;

 Close_Finish:

	swsusp_close(FMODE_READ);

	swsusp_close(FMODE_READ | FMODE_EXCL);

	goto Finish;

}

kernel/power/user.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, 
		if (res <= 0)

			goto unlock;

	} else {

		res = PAGE_SIZE - pg_offp;

		res = PAGE_SIZE;

	}



	if (!data_of(data->handle)) {