From 0f2816cb26b3b298bdaa1948de496df4dbf0a0a9 Mon Sep 17 00:00:00 2001 From: Allen Pais Date: Fri, 2 Jan 2015 12:01:55 +0530 Subject: [PATCH] sparc: report correct hw capabilities for athena Orabug: 18314966 Signed-off-by: Jose Marchesi Reviewed-by: Jerry Snitselaar Signed-off-by: Allen Pais (cherry picked from commit 9efa3c18ad85222ad49bc0a58250b9801176e734) (cherry picked from commit db7b900f9c04d1e3886639dac073c645f534b1db) --- arch/sparc/kernel/setup_64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index f7b261749383b..ecf5d631c77fb 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -570,8 +570,11 @@ static void __init init_sparc64_elf_hwcap(void) sun4v_chip_type == SUN4V_CHIP_SPARC_M6 || sun4v_chip_type == SUN4V_CHIP_SPARC_M7 || sun4v_chip_type == SUN4V_CHIP_SPARC64X) - cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC | - AV_SPARC_FMAF); + cap |= (AV_SPARC_FMAF | AV_SPARC_HPC); + if (sun4v_chip_type == SUN4V_CHIP_NIAGARA3 || + sun4v_chip_type == SUN4V_CHIP_NIAGARA4 || + sun4v_chip_type == SUN4V_CHIP_NIAGARA5) + cap |= AV_SPARC_VIS3; } } sparc64_elf_hwcap = cap | mdesc_caps; -- 2.50.1