From 19925ddb82ab4d10b9637e34a873cc77a98cbe19 Mon Sep 17 00:00:00 2001 From: Allen Pais Date: Mon, 16 Nov 2015 15:47:27 +0530 Subject: [PATCH] sparc64: correctly recognize sparc M8 cpu This patch detects Sparc M8 cpu type. Orabug: 23130139 Signed-off-by: Allen Pais (cherry picked from commit d3ae0cafd1576f4660c9b44fa08b4cecee04f8a8) --- arch/sparc/include/asm/spitfire.h | 3 ++- arch/sparc/kernel/cpu.c | 5 +++++ arch/sparc/kernel/head_64.S | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 4162440d7dd92..ad85617b7b263 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h @@ -47,7 +47,8 @@ #define SUN4V_CHIP_NIAGARA5 0x05 #define SUN4V_CHIP_SPARC_M6 0x06 #define SUN4V_CHIP_SPARC_M7 0x07 -#define SUN4V_CHIP_SPARC_SN 0x08 +#define SUN4V_CHIP_SPARC_M8 0X08 +#define SUN4V_CHIP_SPARC_SN 0x7a #define SUN4V_CHIP_SPARC64X 0x8a #define SUN4V_CHIP_UNKNOWN 0xff diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c index 9ea4493468a29..57fff6df94859 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c @@ -506,6 +506,11 @@ static void __init sun4v_cpu_probe(void) sparc_pmu_type = "sparc-m7"; break; + case SUN4V_CHIP_SPARC_M8: + sparc_cpu_type = "SPARC-M8"; + sparc_fpu_type = "SPARC-M8 integrated FPU"; + sparc_pmu_type = "sparc-m8"; + case SUN4V_CHIP_SPARC_SN: sparc_cpu_type = "SPARC-SN (Sonoma)"; sparc_fpu_type = "SPARC-SN integrated FPU"; diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index 85aaf022164b2..cfc590ee1bd70 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S @@ -435,6 +435,9 @@ sun4v_chip_type: cmp %g2, '7' be,pt %xcc, 5f mov SUN4V_CHIP_SPARC_M7, %g4 + cmp %g2, '8' + be,pt %xcc, 5f + mov SUN4V_CHIP_SPARC_M8, %g4 cmp %g2, 'N' be,pt %xcc, 5f mov SUN4V_CHIP_SPARC_SN, %g4 -- 2.49.0