Commit 667c8893 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control update from Rafael Wysocki:
 "Remove some dead code from the Intel powerclamp thermal control driver
  (Srinivas Pandruvada)"

* tag 'thermal-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: powerclamp: Remove dead code for target mwait value
parents 0c879d88 c6a783be

drivers/thermal/intel/intel_powerclamp.c

+0 −32
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
 */

#define DEFAULT_DURATION_JIFFIES (6)



static unsigned int target_mwait;

static struct dentry *debug_dir;

static bool poll_pkg_cstate_enable;
@@ -312,34 +311,6 @@ MODULE_PARM_DESC(window_size, "sliding window in number of clamping cycles\n" 
	"\twindow size results in slower response time but more smooth\n"

	"\tclamping results. default to 2.");



static void find_target_mwait(void)

{

	unsigned int eax, ebx, ecx, edx;

	unsigned int highest_cstate = 0;

	unsigned int highest_subcstate = 0;

	int i;



	if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF)

		return;



	cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx);



	if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) ||

	    !(ecx & CPUID5_ECX_INTERRUPT_BREAK))

		return;



	edx >>= MWAIT_SUBSTATE_SIZE;

	for (i = 0; i < 7 && edx; i++, edx >>= MWAIT_SUBSTATE_SIZE) {

		if (edx & MWAIT_SUBSTATE_MASK) {

			highest_cstate = i;

			highest_subcstate = edx & MWAIT_SUBSTATE_MASK;

		}

	}

	target_mwait = (highest_cstate << MWAIT_SUBSTATE_SIZE) |

		(highest_subcstate - 1);



}



struct pkg_cstate_info {

	bool skip;

	int msr_index;
@@ -759,9 +730,6 @@ static int __init powerclamp_probe(void) 
		return -ENODEV;

	}



	/* find the deepest mwait value */

	find_target_mwait();



	return 0;

}