Thermal control update for 6.8-rc2

Remove some dead code from the Intel powerclamp thermal control
 driver (Srinivas Pandruvada).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmWz97wSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxGUgP/RYSYL500p1tIJy58mcX9VyDHQzSyRzD
 jabRiolMCix5Kpqgtu8PH4BIrkkPsWep8/eGtm+5E+bBpmyEiFoVZg5pn2f8ao6f
 e5iMlCy51QDiibrTKUOYxQllzNLcVC9+rCsesbzjfwSzVXdIXFWn9r6RySPG6+Lg
 C0csLrorwYU6r5Wif6kNzsOE75ZqfiLisyglynVyq+n8ry3eCFiqDZ3Hrdv6DjJx
 BWeB1fFp8srk30lnNTKSx/trDpBujDCJfY4xv2XoOj1HYZGwyQ/cp1QRPo3jWJx7
 +H/VF0GGqEEju//mF8MxsRcFHBGr+NiSVzgOtjbRs9kwIHhyuxuWU7DqIBaDZafw
 AkAQyyX0vgOjMyDZEHoyellxkQ+MPjPYnvktqLQcnNjFgFirbiAwwBOsfs7ERJek
 AEYReII5lAJl8Jl3odPWi6Gwfc12+E3xsmLnbACYQBYiquzm+MRNDAa0/sb/XwLJ
 fguHUdiXaKp2HtOUCdL/8wRgO/NKL4y3TeQ2e/JQDNaoHdWXtB/t4tti0cqVjABq
 rkrMq4W30il/KMMIz4z6oXetLZpOcBgvx7YDFUzyCfygq7D5Om0zT9veYPIHjmdD
 nxT+d6+HeLUSBcJ4aT3fxBvgLcAyl4GrwwifaJb0wPqeU9/XSl5G6S7VIzSFQWXI
 GEe09YQjn7m/
 =nPxY
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-01-26 15:06:23 -08:00
commit 667c889308

View File

@ -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;
}