x86, cpuid: Unbreak CPB CPUID feature
PATCH 1/2 x86, cpuid: Unbreak CPB CPUID feature
5958f1d5d722df7a9e5d129676614a8e5219bacd added mistakenly the CPB bit to the common scattered CPUID features. Move it to AMD-only code where it belongs.
--- arch/x86/kernel/cpu/amd.c | 5 +++++ arch/x86/kernel/cpu/scattered.c | 1 - 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/amd.c +5 -0
@@ -565,6 +565,11 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) } }#endif + +if (c->extended_cpuid_level >=0x80000007 ) { +if (cpuid_edx (0x80000007 ) &BIT (9 )) +set_cpu_cap (c,X86_FEATURE_CPB ); + } }#ifdef CONFIG_X86_32
arch/x86/kernel/cpu/scattered.c +0 -1
@@ -38,7 +38,6 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) { X86_FEATURE_APERFMPERF, CR_ECX, 0, 0x00000006, 0 }, { X86_FEATURE_EPB, CR_ECX, 3, 0x00000006, 0 }, { X86_FEATURE_XSAVEOPT, CR_EAX, 0, 0x0000000d, 1 }, - { X86_FEATURE_CPB, CR_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_NPT, CR_EDX, 0, 0x8000000a, 0 }, { X86_FEATURE_LBRV, CR_EDX, 1, 0x8000000a, 0 }, { X86_FEATURE_SVML, CR_EDX, 2, 0x8000000a, 0 },
Signature · 12 lines
1.7.1 -- Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
H. Peter Anvin
reviewerQuoted 3 lines · Borislav Petkov
5958f1d5d722df7a9e5d129676614a8e5219bacdadded mistakenly the CPB bit to the common scattered CPUID features. Move it to AMD-only code where it belongs.
I already asked for more information about this. This patch, without a further description, makes absolutely no sense, and is furthermore implemented poorly -- I really don't want more ad hoc code if it can be avoided.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
From: "H. Peter Anvin" <[email protected]>
Date: Mon, Sep 20, 2010 at 11:10:49AM -0400
Quoted 6 lines · Borislav Petkov
Quoted 3 lines
5958f1d5d722df7a9e5d129676614a8e5219bacdadded mistakenly the CPB bit to the common scattered CPUID features. Move it to AMD-only code where it belongs.I already asked for more information about this.
?? When? I prepped this one a couple of hours ago... Am I missing something?
Quoted 3 lines
This patch, without a further description, makes absolutely no sense, and is furthermore implemented poorly -- I really don't want more ad hoc code if it can be avoided.
Well, I use the feature bit in powernow-k8.c. We don't need to advertize it in /proc/cpuinfo per se if that's what you prefer?
Signature · 8 lines
Regards/Gruss, Boris. Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
H. Peter Anvin
reviewerQuoted 12 lines · Borislav Petkov
From: "H. Peter Anvin" <[email protected]>
Date: Mon, Sep 20, 2010 at 11:10:49AM -0400Quoted 6 lines · Borislav Petkov
Quoted 3 lines
5958f1d5d722df7a9e5d129676614a8e5219bacdadded mistakenly the CPB bit to the common scattered CPUID features. Move it to AMD-only code where it belongs.I already asked for more information about this.
?? When? I prepped this one a couple of hours ago... Am I missing something?
Looks like Bugzilla didn't register the reply. I have resent it.
Quoted 6 lines
Quoted 3 lines
This patch, without a further description, makes absolutely no sense, and is furthermore implemented poorly -- I really don't want more ad hoc code if it can be avoided.
Well, I use the feature bit in
powernow-k8.c. We don't need to advertize it in/proc/cpuinfoper se if that's what you prefer?
No, I'm asking why it's being moved away from the common area -- I don't see any evidence that it causes the reported failure scenario, and it complicates the code needlessly.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.