From: Rafael J. Wysocki Date: Tue, 2 Nov 2021 18:31:28 +0000 (+0100) Subject: Merge branches 'pm-em' and 'powercap' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf56b90797c4a03c94b702c50e62296edea9fad9;p=linux.git Merge branches 'pm-em' and 'powercap' Merge Energy Model and power capping updates for 5.16-rc1: - Add support for inefficient operating performance points to the Energy Model and modify cpufreq to use them properly (Vincent Donnefort). - Rearrange the DTPM framework code to simplify it and make it easier to follow (Daniel Lezcano). - Fix power intialization in DTPM (Daniel Lezcano). - Add CPU load consideration when estimating the instaneous power consumption in DTPM (Daniel Lezcano). * pm-em: cpufreq: mediatek-hw: Fix cpufreq_table_find_index_dl() call PM: EM: Mark inefficiencies in CPUFreq cpufreq: Use CPUFREQ_RELATION_E in DVFS governors cpufreq: Introducing CPUFREQ_RELATION_E cpufreq: Add an interface to mark inefficient frequencies cpufreq: Make policy min/max hard requirements PM: EM: Allow skipping inefficient states PM: EM: Extend em_perf_domain with a flag field PM: EM: Mark inefficient states PM: EM: Fix inefficient states detection * powercap: powercap/drivers/dtpm: Fix power limit initialization powercap/drivers/dtpm: Scale the power with the load powercap/drivers/dtpm: Use container_of instead of a private data field powercap/drivers/dtpm: Simplify the dtpm table powercap/drivers/dtpm: Encapsulate even more the code --- bf56b90797c4a03c94b702c50e62296edea9fad9 diff --cc include/linux/cpuhotplug.h index 991911048857a,832d8a74fa596,ad9a34a80440e..773c83730906d --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@@@ -242,11 -240,9 -241,8 +243,10 @@@@ enum cpuhp_state CPUHP_AP_BASE_CACHEINFO_ONLINE, CPUHP_AP_ONLINE_DYN, CPUHP_AP_ONLINE_DYN_END = CPUHP_AP_ONLINE_DYN + 30, ++ /* Must be after CPUHP_AP_ONLINE_DYN for node_states[N_CPU] update */ ++ CPUHP_AP_MM_DEMOTION_ONLINE, CPUHP_AP_X86_HPET_ONLINE, CPUHP_AP_X86_KVM_CLK_ONLINE, -- CPUHP_AP_DTPM_CPU_ONLINE, CPUHP_AP_ACTIVE, CPUHP_ONLINE, };