Commit 0dc35735 authored by Victor Ding's avatar Victor Ding Committed by Zheng Zengkai
Browse files

x86/msr-index: sort AMD RAPL MSRs by address

mainline inclusion
from mainline-5.16-rc7
commit 298ed2b3
category: feature
feature: milan cpu
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NX57


CVE: NA

--------------------------------

MSRs in the rest of this file are sorted by their addresses; fixing the
two outliers.

No functional changes.

Signed-off-by: default avatarVictor Ding <victording@google.com>
Acked-by: default avatarKim Phillips <kim.phillips@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarqinyu <qinyu16@huawei.com>
Reviewed-by: default avatarChao Liu <liuchao173@huawei.com>
Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent c360ef15
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@
#define MSR_PP1_ENERGY_STATUS		0x00000641
#define MSR_PP1_POLICY			0x00000642

#define MSR_AMD_PKG_ENERGY_STATUS	0xc001029b
#define MSR_AMD_RAPL_POWER_UNIT		0xc0010299
#define MSR_AMD_PKG_ENERGY_STATUS	0xc001029b

/* Config TDP MSRs */
#define MSR_CONFIG_TDP_NOMINAL		0x00000648