Messages in this thread Patch in this message | | | From | Bryan O'Donoghue <> | Subject | [PATCH 1/2] x86: Quark: Update cache reporting, add Quark SoC X1000 string | Date | Wed, 1 Oct 2014 00:41:56 +0100 |
| |
Adds a path for legacy_cache_size to get a Quark SoC X1000 cache size Update init_intel to take account of Quark X1000 reporting cache size via legacy_cache_size
Add string to family/model structure for completeness and better output of /proc/cpuinfo
Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie> --- arch/x86/kernel/cpu/intel.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 50ce751..f37f589 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -396,7 +396,15 @@ static void init_intel(struct cpuinfo_x86 *c) #endif } - l2 = init_intel_cacheinfo(c); + /* + * If cache_size has not been initialized via legacy_cache() + * probe it via init_intel_cacheinfo(). + */ + if (c->x86_cache_size == 0) + l2 = init_intel_cacheinfo(c); + else + l2 = c->x86_cache_size; + if (c->cpuid_level > 9) { unsigned eax = cpuid_eax(10); /* Check for version and the number of counters */ @@ -500,6 +508,13 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 *c, unsigned int size) */ if ((c->x86 == 6) && (c->x86_model == 11) && (size == 0)) size = 256; + + /* + * Intel Quark SoC X1000 contains a 4-way set associative + * 16K cache with a 16 byte cache line and 256 lines per tag + */ + if ((c->x86 == 5) && (c->x86_model == 9)) + size = 16; return size; } #endif @@ -701,7 +716,8 @@ static const struct cpu_dev intel_cpu_dev = { [3] = "OverDrive PODP5V83", [4] = "Pentium MMX", [7] = "Mobile Pentium 75 - 200", - [8] = "Mobile Pentium MMX" + [8] = "Mobile Pentium MMX", + [9] = "Quark SoC X1000", } }, { .family = 6, .model_names = -- 1.9.1
| |