Skip to content

Commit 9f01129

Browse files
ChangSeokBaesuryasaimadhu
authored andcommitted
intel_idle: Add a new flag to initialize the AMX state
The non-initialized AMX state can be the cause of C-state demotion from C6 to C1E. This low-power idle state may improve power savings and thus result in a higher available turbo frequency budget. This behavior is implementation-specific. Initialize the state for the C6 entrance of Sapphire Rapids as needed. Suggested-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Zhang Rui <rui.zhang@intel.com> Link: https://lkml.kernel.org/r/20220614164116.5196-1-chang.seok.bae@intel.com
1 parent f17b168 commit 9f01129

1 file changed

Lines changed: 23 additions & 2 deletions

File tree

drivers/idle/intel_idle.c

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include <asm/nospec-branch.h>
5757
#include <asm/mwait.h>
5858
#include <asm/msr.h>
59+
#include <asm/fpu/api.h>
5960

6061
#define INTEL_IDLE_VERSION "0.5.1"
6162

@@ -113,6 +114,11 @@ static unsigned int mwait_substates __initdata;
113114
*/
114115
#define CPUIDLE_FLAG_IBRS BIT(16)
115116

117+
/*
118+
* Initialize large xstate for the C6-state entrance.
119+
*/
120+
#define CPUIDLE_FLAG_INIT_XSTATE BIT(17)
121+
116122
/*
117123
* MWAIT takes an 8-bit "hint" in EAX "suggesting"
118124
* the C-state (top nibble) and sub-state (bottom nibble)
@@ -185,6 +191,13 @@ static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev,
185191
return ret;
186192
}
187193

194+
static __cpuidle int intel_idle_xstate(struct cpuidle_device *dev,
195+
struct cpuidle_driver *drv, int index)
196+
{
197+
fpu_idle_fpregs();
198+
return __intel_idle(dev, drv, index);
199+
}
200+
188201
/**
189202
* intel_idle_s2idle - Ask the processor to enter the given idle state.
190203
* @dev: cpuidle device of the target CPU.
@@ -200,8 +213,12 @@ static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev,
200213
static __cpuidle int intel_idle_s2idle(struct cpuidle_device *dev,
201214
struct cpuidle_driver *drv, int index)
202215
{
203-
unsigned long eax = flg2MWAIT(drv->states[index].flags);
204216
unsigned long ecx = 1; /* break on interrupt flag */
217+
struct cpuidle_state *state = &drv->states[index];
218+
unsigned long eax = flg2MWAIT(state->flags);
219+
220+
if (state->flags & CPUIDLE_FLAG_INIT_XSTATE)
221+
fpu_idle_fpregs();
205222

206223
mwait_idle_with_hints(eax, ecx);
207224

@@ -936,7 +953,8 @@ static struct cpuidle_state spr_cstates[] __initdata = {
936953
{
937954
.name = "C6",
938955
.desc = "MWAIT 0x20",
939-
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
956+
.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED |
957+
CPUIDLE_FLAG_INIT_XSTATE,
940958
.exit_latency = 290,
941959
.target_residency = 800,
942960
.enter = &intel_idle,
@@ -1851,6 +1869,9 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv)
18511869
drv->states[drv->state_count].enter = intel_idle_ibrs;
18521870
}
18531871

1872+
if (cpuidle_state_table[cstate].flags & CPUIDLE_FLAG_INIT_XSTATE)
1873+
drv->states[drv->state_count].enter = intel_idle_xstate;
1874+
18541875
if ((disabled_states_mask & BIT(drv->state_count)) ||
18551876
((icpu->use_acpi || force_use_acpi) &&
18561877
intel_idle_off_by_default(mwait_hint) &&

0 commit comments

Comments
 (0)