From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4109DC6FA82 for ; Fri, 9 Sep 2022 14:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v1zygoQpz7vIEQfdkE1FdVS6RJItEuZHThM/3pd32CA=; b=k1VXjVtpkZLx4f M71MnYNTd9k+gzPEWv7HFCq19FShlFicHmS965QA2AcE87v6MqUDrNxz4y4JSQh5DIZIwZMhfVwTR GVeI6nCCYzZsLko623SAWK56TYk1dmaRJPnn7BioaldUZyh79CER0kRlUfYjhenYrtIecv1VeUtM9 9BnDr2mAkP4w9u5NzqL/qY2x2aQaUz5IbAm4ju+QZplk8AAHVwbMt+ObCFza2yETlsBJ2PVGJ6w80 z2T+1NDijdSvQup6AEgVFCFQPzz1+Led8p/wQvnPItIhiaWIi0OUqSyxqc/r/4EveLyi2vWSCL73l v2X4e6+1jmugQinI7YHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWfPQ-00GsiP-AR; Fri, 09 Sep 2022 14:55:08 +0000 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWfPN-00Gsh2-Pc for linux-arm-kernel@lists.infradead.org; Fri, 09 Sep 2022 14:55:07 +0000 Received: by mail-qt1-x833.google.com with SMTP id c11so1442333qtw.8 for ; Fri, 09 Sep 2022 07:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=bCvNKZoLydGpNHfnmbhPHdRB0xcZW5gv/VnZsrr3nIY=; b=aROr7p194S8QWVGn8J27yn15HcdwP8Pmes6eH9lKtOyxkH/EKF0u6qGFTZF5C+q2b2 xtqBzLQfuRBO5m7giVDzdyenhsv4d27DhLrGJK6p4dOKGCOE9pEZjHNh6lQAVz40hG7Z ratrOQIt7Mtn6hUQ2qmb06eGZVA2Id8QTA8Ngmcax8fO7a1YJ51UErXeS0WHj7s4neFn 4Z4JSG5U/LIrpMEtk3rKDnRFBmZ508smDREdKFxBiTto6ztzkrlgBElrYPdJ1olVodHj VFwTrQN2AZ8IjHKvAdxQbSPsPgkItJyN5sBJj6UsKi6VwMIHwBpEgP2lMPQryhDvaUlo NbsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=bCvNKZoLydGpNHfnmbhPHdRB0xcZW5gv/VnZsrr3nIY=; b=GsFjKCxDf9QPsZSRPFXkhLDGcviGHez5vEx4WEec7bJUQAEpylt1gd3MtqMVrgImMo j4JQjNNM0+30ZwoS08uy2wI3CRNgKD6BBbz1pndM8K8vITBXrNqi92rh4ABawlnylpeh 4n30aMrKWbhXbng7E2vA1KK5AFq/kNj53fkVB0s3SszNNqyL6tK1d6pmrC/oZ+vioF2Y zCCRHNAfmyJw/sG28GRShexjH/vDpiJQYLVXLvPx/wFYruDm0c7bl7DJGwFnFvboItEA AvIKLkIt9Oy1zcMemSCLClqwhbr7sKqh2BGzOHEnWlzdKJANU+kH8o5xRBU0KWAxy2Y0 ufNw== X-Gm-Message-State: ACgBeo3g08uN6vBfyFGmU1FO1FL+CB3JX9QX2quw3ZAJC06PGEwDc1mt JDmDjDJnFN7OOrSua2StzgQhIhBZKNUGnilac60= X-Google-Smtp-Source: AA6agR7kap/mZYJkOyyNkUwnHdsb4MvcIgInmUHiEb3ySElzqIee88HmlSAwUWVFmGmJIkW5AaJTwUpeLWYJFMwWF2k= X-Received: by 2002:ac8:5fc8:0:b0:344:5ac5:c8e4 with SMTP id k8-20020ac85fc8000000b003445ac5c8e4mr12651106qta.113.1662735303638; Fri, 09 Sep 2022 07:55:03 -0700 (PDT) MIME-Version: 1.0 References: <20220901141307.2361752-1-georgepee@gmail.com> <28b35935-4e7f-2bd5-dda5-ed81402a527e@arm.com> In-Reply-To: <28b35935-4e7f-2bd5-dda5-ed81402a527e@arm.com> From: George Pee Date: Fri, 9 Sep 2022 09:54:52 -0500 Message-ID: Subject: Re: [PATCH] Report support for optional ARMv8.2 half-precision floating point extension To: Robin Murphy Cc: Russell King , "Russell King (Oracle)" , Catalin Marinas , "Kirill A. Shutemov" , Austin Kim , Ard Biesheuvel , Mike Rapoport , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_075505_865339_898718C9 X-CRM114-Status: GOOD ( 38.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org That makes a lot of sense. How's this? Flipping the HWCAP2_FPHP bit is already in a CONFIG_VFPv3 check. diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h index 990199d8b7c6..5d635dce8853 100644 --- a/arch/arm/include/uapi/asm/hwcap.h +++ b/arch/arm/include/uapi/asm/hwcap.h @@ -37,5 +37,6 @@ #define HWCAP2_SHA1 (1 << 2) #define HWCAP2_SHA2 (1 << 3) #define HWCAP2_CRC32 (1 << 4) +#define HWCAP2_FPHP (1 << 5) #endif /* _UAPI__ASMARM_HWCAP_H */ diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index c39303e5c234..161f8df852e1 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -625,11 +625,12 @@ call_fpe: ret.w lr @ CP#6 ret.w lr @ CP#7 ret.w lr @ CP#8 - ret.w lr @ CP#9 #ifdef CONFIG_VFP + W(b) do_vfp @ CP#9 (VFP/FP16) W(b) do_vfp @ CP#10 (VFP) W(b) do_vfp @ CP#11 (VFP) #else + ret.w lr @ CP#9 ret.w lr @ CP#10 (VFP) ret.w lr @ CP#11 (VFP) #endif diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 1e8a50a97edf..8887d0f447d6 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1258,6 +1258,7 @@ static const char *hwcap2_str[] = { "sha1", "sha2", "crc32", + "fphp", NULL }; diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 2cb355c1b5b7..fb774fd5c614 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -831,6 +831,8 @@ static int __init vfp_init(void) if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000) elf_hwcap |= HWCAP_VFPv4; + if ((fmrx(MVFR1) & 0x0f000000) == 0x03000000) + elf_hwcap2 |= HWCAP2_FPHP; } /* Extract the architecture version on pre-cpuid scheme */ } else { On Fri, Sep 9, 2022 at 9:17 AM Robin Murphy wrote: > > On 2022-09-09 14:34, George Pee wrote: > > Adding the hwcap was part of the diagnosis process-- I added it just > > to make sure that the cpu in question supported the optional > > extension. > > It seems like it could be useful to be able to check for support in > > /proc/cpuinfo. > > Sure, but "support" is about more than just what happens to be present > in hardware. Observe that you can build the 32-bit kernel with > CONFIG_VFP=n, and it then does not report and VFP or NEON hwcaps, > because those features will not be usable in that configuration, even if > you know the hardware implements them. > > Note that this looks different on arm64, since there we always expect to > have FPSIMD hardware available, so support in the kernel is > unconditional, plus that kernel support is also a lot simpler since we > don't have a soft-float ABI with all the corresponding trapping stuff > either. > > It might just be the case here that the call_fpe logic needs a bit of > tweaking to provide proper support, but I'm not sufficiently familiar > with the ARM VFP code in general to be sure. > > Thanks, > Robin. > > > On Fri, Sep 9, 2022 at 7:46 AM Robin Murphy wrote: > >> > >> On 2022-09-01 15:13, george pee wrote: > >>> Report as fphp to be consistent with arm64 > >> > >> Wasn't the original problem that the VFP support code doesn't understand > >> the new FP16 instruction encodings, so in practice they don't actually > >> work reliably? Exposing a hwcap to say they're functional doesn't > >> inherently make them functional - if there is already another patch > >> somewhere for that, it should be made clear that this depends on it. > >> > >> Robin. > >> > >>> Signed-off-by: george pee > >>> --- > >>> arch/arm/include/uapi/asm/hwcap.h | 1 + > >>> arch/arm/kernel/setup.c | 1 + > >>> arch/arm/vfp/vfpmodule.c | 2 ++ > >>> 3 files changed, 4 insertions(+) > >>> > >>> diff --git a/arch/arm/include/uapi/asm/hwcap.h b/arch/arm/include/uapi/asm/hwcap.h > >>> index 990199d8b7c6..f975845ce5d3 100644 > >>> --- a/arch/arm/include/uapi/asm/hwcap.h > >>> +++ b/arch/arm/include/uapi/asm/hwcap.h > >>> @@ -28,6 +28,7 @@ > >>> #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) > >>> #define HWCAP_LPAE (1 << 20) > >>> #define HWCAP_EVTSTRM (1 << 21) > >>> +#define HWCAP_FPHP (1 << 22) > >>> > >>> /* > >>> * HWCAP2 flags - for elf_hwcap2 (in kernel) and AT_HWCAP2 > >>> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c > >>> index 1e8a50a97edf..6694ced0552a 100644 > >>> --- a/arch/arm/kernel/setup.c > >>> +++ b/arch/arm/kernel/setup.c > >>> @@ -1249,6 +1249,7 @@ static const char *hwcap_str[] = { > >>> "vfpd32", > >>> "lpae", > >>> "evtstrm", > >>> + "fphp", > >>> NULL > >>> }; > >>> > >>> diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c > >>> index 2cb355c1b5b7..cef8c64ce8bd 100644 > >>> --- a/arch/arm/vfp/vfpmodule.c > >>> +++ b/arch/arm/vfp/vfpmodule.c > >>> @@ -831,6 +831,8 @@ static int __init vfp_init(void) > >>> > >>> if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000) > >>> elf_hwcap |= HWCAP_VFPv4; > >>> + if ((fmrx(MVFR1) & 0x0f000000) == 0x03000000) > >>> + elf_hwcap |= HWCAP_FPHP; > >>> } > >>> /* Extract the architecture version on pre-cpuid scheme */ > >>> } else { _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel