Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2535270pxj; Mon, 10 May 2021 05:23:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzheLGArdngH0QPeqBABgmMIsc2Il2pCGKJo9pyC1TigGbystSGW1mxu5v8WymHvXWoVH5R X-Received: by 2002:a17:906:aac5:: with SMTP id kt5mr25779672ejb.414.1620649433118; Mon, 10 May 2021 05:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649433; cv=none; d=google.com; s=arc-20160816; b=hGpHwj8IBX1E598PRvhtPtcZ3MUIYTSglCZzDQD8dp89lujsqyNildd3KlNRunWmdv qP3gNM51lfdbJKlOwF6xF+nhVf2C+iD3ChWsB1mv6ngzBDMVW5UtbDWY241Q3U680eoR T8d107Oyq52vETVnDgyj/UPlVz0NlgxBhXP347lWi+MvtTq1EYX9yvF69QjKf79b+TKV o6AzxG1ZsNQ3A9bZgZuaM2AKD6rbtkh5tWek3kLUjA6nLuzFDMFBfn5JWHH4JtJL+X1S lRlpDBr0b585DTPfTd/1HkSbZiwS9213OoDqdKAystqggSHviEl3SsRGVLVMnB3R9pyR kJPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=coLbGHmptcj0gkGjxJvzo85Zcb0DQ27NApmckGnQJww=; b=DmJqm5BSXgRQNQuVju1K+j3VIRCJ2HGYB3CQI2Dhlp6qAohLatV1Y5nRo+GIMJ2om+ HlAYWS7Y/c1A6uj8Em9NSUfk74yOuOm2XhSk+droX69ABlc5wSgHErFU7VIIs3ohex0c 4+vILasHz6aUJco+dcc9Xng7x4ym56I/4DvXBV9Ke9nRVEX0Dqs4lWvBxcxpd9yqKeVs r2KXN0mN36hDKGQUymk/p+Nbl/KMOYmWx79SQf5pjJkhU4+PLlvSPfjplP4Yxgxsc6yi T0gNbke1/q9TYJWfOE0Tzob7QitDZAU9eUDT/5Uyerai70uVhtWyuc7VWGZ4WlBCLt6N yScw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FjkEi5eo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cz22si8827400edb.24.2021.05.10.05.23.29; Mon, 10 May 2021 05:23:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FjkEi5eo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344064AbhEJMO6 (ORCPT + 99 others); Mon, 10 May 2021 08:14:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:34304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234090AbhEJLEb (ORCPT ); Mon, 10 May 2021 07:04:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7F58061925; Mon, 10 May 2021 10:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644093; bh=GP313qOubS9rto88V4AxPe+esMFnkQi8JAn6FdOn3f8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FjkEi5eo4Hjmc/ebfDNjxbbngZ15fIk2TNU59d6NDVDbXQGCvn4K4g8+1C9FEvxud H4rVxpvNLJ1tOmRNiMyDg1oIDTrV0Oln77OzFEZfM1fcoDouXqW4J5zDj3T/Is2TCN OAGuOF2yi+bopBua3OoS+P14Hd+r3xUdhsW/zQ7c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Jessica Clarke , Nathan Chancellor , "Jason A. Donenfeld" , Nick Desaulniers , Herbert Xu Subject: [PATCH 5.11 283/342] crypto: arm/curve25519 - Move .fpu after .arch Date: Mon, 10 May 2021 12:21:13 +0200 Message-Id: <20210510102019.459895727@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Chancellor commit 44200f2d9b8b52389c70e6c7bbe51e0dc6eaf938 upstream. Debian's clang carries a patch that makes the default FPU mode 'vfp3-d16' instead of 'neon' for 'armv7-a' to avoid generating NEON instructions on hardware that does not support them: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/raw/5a61ca6f21b4ad8c6ac4970e5ea5a7b5b4486d22/debian/patches/clang-arm-default-vfp3-on-armv7a.patch https://bugs.debian.org/841474 https://bugs.debian.org/842142 https://bugs.debian.org/914268 This results in the following build error when clang's integrated assembler is used because the '.arch' directive overrides the '.fpu' directive: arch/arm/crypto/curve25519-core.S:25:2: error: instruction requires: NEON vmov.i32 q0, #1 ^ arch/arm/crypto/curve25519-core.S:26:2: error: instruction requires: NEON vshr.u64 q1, q0, #7 ^ arch/arm/crypto/curve25519-core.S:27:2: error: instruction requires: NEON vshr.u64 q0, q0, #8 ^ arch/arm/crypto/curve25519-core.S:28:2: error: instruction requires: NEON vmov.i32 d4, #19 ^ Shuffle the order of the '.arch' and '.fpu' directives so that the code builds regardless of the default FPU mode. This has been tested against both clang with and without Debian's patch and GCC. Cc: stable@vger.kernel.org Fixes: d8f1308a025f ("crypto: arm/curve25519 - wire up NEON implementation") Link: https://github.com/ClangBuiltLinux/continuous-integration2/issues/118 Reported-by: Arnd Bergmann Suggested-by: Arnd Bergmann Suggested-by: Jessica Clarke Signed-off-by: Nathan Chancellor Acked-by: Jason A. Donenfeld Reviewed-by: Nick Desaulniers Tested-by: Nick Desaulniers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- arch/arm/crypto/curve25519-core.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm/crypto/curve25519-core.S +++ b/arch/arm/crypto/curve25519-core.S @@ -10,8 +10,8 @@ #include .text -.fpu neon .arch armv7-a +.fpu neon .align 4 ENTRY(curve25519_neon)