Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pm-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix an Intel RAPL power capping driver regression introduced during
the 6.5 development cycle (Srinivas Pandruvada)"
* tag 'pm-6.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
powercap: intel_rapl: Fix invalid setting of Power Limit 4
+1
-3
+1
-3
drivers/powercap/intel_rapl_common.c
+1
-3
drivers/powercap/intel_rapl_common.c
···
658
658
RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
659
659
[PL2_CLAMP] = PRIMITIVE_INFO_INIT(PL2_CLAMP, POWER_LIMIT2_CLAMP, 48,
660
660
RAPL_DOMAIN_REG_LIMIT, ARBITRARY_UNIT, 0),
661
-
[PL4_ENABLE] = PRIMITIVE_INFO_INIT(PL4_ENABLE, POWER_LIMIT4_MASK, 0,
662
-
RAPL_DOMAIN_REG_PL4, ARBITRARY_UNIT, 0),
663
661
[TIME_WINDOW1] = PRIMITIVE_INFO_INIT(TIME_WINDOW1, TIME_WINDOW1_MASK, 17,
664
662
RAPL_DOMAIN_REG_LIMIT, TIME_UNIT, 0),
665
663
[TIME_WINDOW2] = PRIMITIVE_INFO_INIT(TIME_WINDOW2, TIME_WINDOW2_MASK, 49,
···
1456
1458
}
1457
1459
}
1458
1460
1459
-
if (rapl_read_pl_data(rd, i, PL_ENABLE, false, &val64))
1461
+
if (rapl_read_pl_data(rd, i, PL_LIMIT, false, &val64))
1460
1462
rd->rpl[i].name = NULL;
1461
1463
}
1462
1464
}