From: Joe Moriarty Date: Wed, 15 Jun 2016 14:29:18 +0000 (-0400) Subject: sparc64: support for identifying Sonoma 2 systems X-Git-Tag: v4.1.12-92~74^2~16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4bd843999066b23fe501ead37e94bf716d2b7c6a;p=users%2Fjedix%2Flinux-maple.git sparc64: support for identifying Sonoma 2 systems Needed for Sonoma 2 software support Orabug: 22960812 Signed-off-by: Joe Moriarty Acked-by: Allen Pais (cherry picked from commit 8a9b7d9b25a3ad54bc41294f93ce814038f01c70) (cherry picked from commit a8ce3853635573a42e49df9c8b7e87bf35656561) Signed-off-by: Allen Pais --- diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h index 43c9f0d4208c3..643482ce0d956 100644 --- a/arch/sparc/include/asm/spitfire.h +++ b/arch/sparc/include/asm/spitfire.h @@ -49,6 +49,7 @@ #define SUN4V_CHIP_SPARC_M7 0x07 #define SUN4V_CHIP_SPARC_M8 0X08 #define SUN4V_CHIP_SPARC_S7 0x7a +#define SUN4V_CHIP_SPARC_S8 0x7b #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 848cad738e55d..5d62519f8a6d0 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c @@ -518,6 +518,12 @@ static void __init sun4v_cpu_probe(void) sparc_pmu_type = "sparc-s7"; break; + case SUN4V_CHIP_SPARC_S8: + sparc_cpu_type = "SPARC-S8 (Sonoma2)"; + sparc_fpu_type = "SPARC-S8 integrated FPU"; + sparc_pmu_type = "sparc-s8"; + break; + case SUN4V_CHIP_SPARC64X: sparc_cpu_type = "SPARC64-X"; sparc_fpu_type = "SPARC64-X integrated FPU"; diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S index 9903aa17bb4ee..13517e7603649 100644 --- a/arch/sparc/kernel/head_64.S +++ b/arch/sparc/kernel/head_64.S @@ -461,6 +461,9 @@ sun4v_chip_type: cmp %g2, '7' be,pt %xcc, 5f mov SUN4V_CHIP_SPARC_S7, %g4 + cmp %g2, '8' + be,pt %xcc, 5f + mov SUN4V_CHIP_SPARC_S8, %g4 ba,pt %xcc, 49f nop 91: sethi %hi(prom_cpu_compatible), %g1