x86/msr-index: Move AMD MSRs where they belong
Borislav Petkov
maintainerPATCH 1/1 x86/msr-index: Move AMD MSRs where they belong
From: Borislav Petkov <[email protected]>
... sort them in and fixup comment, while at it.
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/msr-index.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/x86/include/asm/msr-index.h +7 -6
@@ -375,13 +375,17 @@/* Alternative perfctr range with full access. */ #define MSR_IA32_PMC0 0x000004c1 -/* AMD64 MSRs. Not complete. See the architecture manual for a more -complete list. */ - +/* +* AMD64 MSRs. Not complete. See the architecture manual for a more +* complete list. +*/ #define MSR_AMD64_PATCH_LEVEL 0x0000008b#define MSR_AMD64_TSC_RATIO 0xc0000104#define MSR_AMD64_NB_CFG 0xc001001f#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD_PERF_CTL 0xc0010062 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140#define MSR_AMD64_OSVW_STATUS 0xc0010141#define MSR_AMD64_LS_CFG 0xc0011020
@@ -560,9 +564,6 @@#define MSR_IA32_PERF_STATUS 0x00000198#define MSR_IA32_PERF_CTL 0x00000199#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062#define MSR_IA32_MPERF 0x000000e7#define MSR_IA32_APERF 0x000000e8
Signature · 1 line
2.21.0
tip-bot for Borislav Petkov
merge botx86/msr-index: Move AMD MSRs where they belong
Commit-ID: 342061c53a049569fc7f56d237753c26b4b2166d Gitweb: https://git.kernel.org/tip/342061c53a049569fc7f56d237753c26b4b2166d Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 19 Aug 2019 09:01:40 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 19 Aug 2019 10:55:44 +0200
x86/msr-index: Move AMD MSRs where they belong
... sort them in and fixup comment, while at it.
No functional changes.
Signed-off-by Borislav Petkov <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/msr-index.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/x86/include/asm/msr-index.h +7 -6
@@ -375,13 +375,17 @@/* Alternative perfctr range with full access. */ #define MSR_IA32_PMC0 0x000004c1 -/* AMD64 MSRs. Not complete. See the architecture manual for a more -complete list. */ - +/* +* AMD64 MSRs. Not complete. See the architecture manual for a more +* complete list. +*/ #define MSR_AMD64_PATCH_LEVEL 0x0000008b#define MSR_AMD64_TSC_RATIO 0xc0000104#define MSR_AMD64_NB_CFG 0xc001001f#define MSR_AMD64_PATCH_LOADER 0xc0010020 +#define MSR_AMD_PERF_CTL 0xc0010062 +#define MSR_AMD_PERF_STATUS 0xc0010063 +#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064#define MSR_AMD64_OSVW_ID_LENGTH 0xc0010140#define MSR_AMD64_OSVW_STATUS 0xc0010141#define MSR_AMD64_LS_CFG 0xc0011020
@@ -560,9 +564,6 @@#define MSR_IA32_PERF_STATUS 0x00000198#define MSR_IA32_PERF_CTL 0x00000199#define INTEL_PERF_CTL_MASK 0xffff -#define MSR_AMD_PSTATE_DEF_BASE 0xc0010064 -#define MSR_AMD_PERF_STATUS 0xc0010063 -#define MSR_AMD_PERF_CTL 0xc0010062#define MSR_IA32_MPERF 0x000000e7#define MSR_IA32_APERF 0x000000e8