From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932537AbbICSNo (ORCPT ); Thu, 3 Sep 2015 14:13:44 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:34041 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757266AbbICSNl (ORCPT ); Thu, 3 Sep 2015 14:13:41 -0400 From: Alexander Kuleshov To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexander Kuleshov Subject: [PATCH 3/3] arm64/fpsimd: Use ID_AA64PFR0_EL1_.* macros Date: Fri, 4 Sep 2015 00:12:59 +0600 Message-Id: <1441303979-9535-1-git-send-email-kuleshovmail@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1441303911-9421-1-git-send-email-kuleshovmail@gmail.com> References: <1441303911-9421-1-git-send-email-kuleshovmail@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The 26d75e67c commit (arm64/cpufeature.h: Add macros for a cpu features testing) provides set of macros for the testing processor's FP and advanced SIMD features. Let's use these macros instead of direct calculation. Signed-off-by: Alexander Kuleshov --- arch/arm64/kernel/fpsimd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index 44d6f75..12943a5 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -27,6 +27,7 @@ #include #include +#include #define FPEXC_IOF (1 << 0) #define FPEXC_DZF (1 << 1) @@ -333,13 +334,13 @@ static int __init fpsimd_init(void) { u64 pfr = read_cpuid(ID_AA64PFR0_EL1); - if (pfr & (0xf << 16)) { + if (ID_AA64PFR0_EL1_FP(pfr)) { pr_notice("Floating-point is not implemented\n"); return 0; } elf_hwcap |= HWCAP_FP; - if (pfr & (0xf << 20)) + if (ID_AA64PFR0_EL1_ADV_SIMD(pfr)) pr_notice("Advanced SIMD is not implemented\n"); else elf_hwcap |= HWCAP_ASIMD; -- 2.5.0