Skip to contentSkip to conversation

x86, amd: Remove needless CPU family check (for L3 cache info)

PATCH In review Andreas Herrmann 2 participants 2 messages Sep 2, 2010 – Sep 5, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86, amd: Remove needless CPU family check (for L3 cache info)

From: Andreas Herrmann <[email protected]>

Old 32-bit AMD CPUs (all w/o L3 cache) should always return 0 for cpuid_edx(0x80000006).

For unknown reason the 32-bit implementation differed from the 64-bit implementation. See commit 67cddd947992b02f01ad093ec814738c5827d17c (i386: Add L3 cache support to AMD CPUID4 emulation).
The current check is the result of the x86 merge.

---
 arch/x86/kernel/cpu/amd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/amd.c +1 -1
index fcf9895..a965b53 100644
@@ -539,7 +539,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 #endif
 
 	if (c->extended_cpuid_level >= 0x80000006) {
-		if ((c->x86 >= 0x0f) && (cpuid_edx(0x80000006) & 0xf000))
+		if (cpuid_edx(0x80000006) & 0xf000)
 			num_cache_leaves = 4;
 		else
 			num_cache_leaves = 3;
Signature · 1 line
1.6.4.4
#1 lore raw

[tip:x86/cpu] x86, AMD: Remove needless CPU family check (for L3 cache info)

Commit-ID:  d9fadd7ba99a67030783a212bcb17d11f0678433
Gitweb:     http://git.kernel.org/tip/d9fadd7ba99a67030783a212bcb17d11f0678433
Author:     Andreas Herrmann <[email protected]>
AuthorDate: Thu, 2 Sep 2010 15:37:10 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sun, 5 Sep 2010 14:33:48 +0200

x86, AMD: Remove needless CPU family check (for L3 cache info)

Old 32-bit AMD CPUs (all w/o L3 cache) should always return 0 for cpuid_edx(0x80000006).

For unknown reason the 32-bit implementation differed from the 64-bit implementation. See commit 67cddd94799 ("i386: Add L3 cache support to AMD CPUID4 emulation"). The current check is the result of the x86 merge.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/cpu/amd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/amd.c +1 -1
index fc563fa..0f0ace5 100644
@@ -540,7 +540,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 #endif
 
 	if (c->extended_cpuid_level >= 0x80000006) {
-		if ((c->x86 >= 0x0f) && (cpuid_edx(0x80000006) & 0xf000))
+		if (cpuid_edx(0x80000006) & 0xf000)
 			num_cache_leaves = 4;
 		else
 			num_cache_leaves = 3;