Unverified Commit 8614faa4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!749 intel: backport intel-idle support for EMR 

Merge Pull Request from: @jiayingbao 
 
intel_idle: add Emerald Rapids Xeon support
commit 74528edf upstream.
Emerald Rapids (EMR) is the next Intel Xeon processor after Sapphire
Rapids (SPR).

EMR C-states are the same as SPR C-states, and we expect that EMR
C-state characteristics (latency and target residency) will be the
same as in SPR. Therefore, add EMR support by using SPR C-states table.


no change from upstream patch.

driver can be initial successfully as SPR.

PR dependency: 
https://gitee.com/openeuler/kernel/pulls/469
 
 
Link:https://gitee.com/openeuler/kernel/pulls/749

 

Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1ee0232e 28f07af4

drivers/idle/intel_idle.c

+2 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = { 
	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&idle_cpu_icx),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		&idle_cpu_icx),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&idle_cpu_spr),

	X86_MATCH_INTEL_FAM6_MODEL(EMERALDRAPIDS_X,	&idle_cpu_spr),

	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL,	&idle_cpu_knl),

	X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM,	&idle_cpu_knl),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT,	&idle_cpu_bxt),
@@ -1644,6 +1645,7 @@ static void __init intel_idle_init_cstates_icpu(struct cpuidle_driver *drv) 
		skx_idle_state_table_update();

		break;

	case INTEL_FAM6_SAPPHIRERAPIDS_X:

	case INTEL_FAM6_EMERALDRAPIDS_X:

		spr_idle_state_table_update();

		break;

	}