x86, amd: Make check_c1e_idle explicit
PATCH 1/1 x86, amd: Make check_c1e_idle explicit
Signed-off-by Andreas Herrmann <[email protected]>
--- arch/x86/kernel/process.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
arch/x86/kernel/process.c +6 -8
@@ -494,21 +494,19 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) }/* -* Check for AMD CPUs, which have potentially C1E support +* Check for AMD CPUs, which potentially use SMI or hardware initiated C1E */ static int __cpuinit check_c1e_idle (const struct cpuinfo_x86 *c) {if (c->x86_vendor !=X86_VENDOR_AMD )return 0 ; -if (c->x86 <0x0F ) -return 0 ; - -/* Family 0x0f models < rev F do not have C1E */ -if (c->x86 ==0x0f && c->x86_model <0x40 ) -return 0 ; +if ((c->x86 ==0x0F && c->x86_model >=0x40 ) || + (c->x86 ==0x10 ) || + (c->x86 ==0x11 )) +return 1 ; -return 1 ; +return 0 ; }static cpumask_var_t c1e_mask;
Signature · 1 line
1.6.4.2
H. Peter Anvin
reviewerThis patch needs a lot better documentation. For one thing, it needs an explicit patch comment!
In particular, is this a contract that fam 0x12+ will behave differently?
-hpa
Quoted 39 lines · Andreas Herrmann
Signed-off-by Andreas Herrmann <[email protected]>--- arch/x86/kernel/process.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)arch/x86/kernel/process.c +6
-8@@ -494,21 +494,19 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) }/* -* Check for AMD CPUs, which have potentially C1E support +* Check for AMD CPUs, which potentially use SMI or hardware initiated C1E */ static int __cpuinit check_c1e_idle (const struct cpuinfo_x86 *c) {if (c->x86_vendor !=X86_VENDOR_AMD )return 0 ; -if (c->x86 <0x0F ) -return 0 ; - -/* Family 0x0f models < rev F do not have C1E */ -if (c->x86 ==0x0f && c->x86_model <0x40 ) -return 0 ; +if ((c->x86 ==0x0F && c->x86_model >=0x40 ) || + (c->x86 ==0x10 ) || + (c->x86 ==0x11 )) +return 1 ; -return 1 ; +return 0 ; }static cpumask_var_t c1e_mask;
PATCH v2 1/1 x86, amd: Make check_c1e_idle explicit
With current code c1e_idle() will try to access MSR 0xc0010055 for all future AMD CPUs. But that MSR is not architectural. So it's wrong to access the MSR unconditionally.
Signed-off-by Andreas Herrmann <[email protected]>
--- arch/x86/kernel/process.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
arch/x86/kernel/process.c +6 -8
@@ -494,21 +494,19 @@ static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) }/* -* Check for AMD CPUs, which have potentially C1E support +* Check for AMD CPUs, which potentially use SMI or hardware initiated C1E */ static int __cpuinit check_c1e_idle (const struct cpuinfo_x86 *c) {if (c->x86_vendor !=X86_VENDOR_AMD )return 0 ; -if (c->x86 <0x0F ) -return 0 ; - -/* Family 0x0f models < rev F do not have C1E */ -if (c->x86 ==0x0f && c->x86_model <0x40 ) -return 0 ; +if ((c->x86 ==0x0F && c->x86_model >=0x40 ) || + (c->x86 ==0x10 ) || + (c->x86 ==0x11 )) +return 1 ; -return 1 ; +return 0 ; }static cpumask_var_t c1e_mask;
Signature · 1 line
1.6.4.2