From patchwork Mon Jan 16 09:17:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 643552 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AABBEC54EBE for ; Mon, 16 Jan 2023 09:19:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232842AbjAPJTB (ORCPT ); Mon, 16 Jan 2023 04:19:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232156AbjAPJRy (ORCPT ); Mon, 16 Jan 2023 04:17:54 -0500 Received: from formenos.hmeau.com (helcar.hmeau.com [216.24.177.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 136DDF76B; Mon, 16 Jan 2023 01:17:25 -0800 (PST) Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.94.2 #2 (Debian)) id 1pHLcF-000RAu-NC; Mon, 16 Jan 2023 17:17:20 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Mon, 16 Jan 2023 17:17:19 +0800 Date: Mon, 16 Jan 2023 17:17:19 +0800 From: Herbert Xu To: Stephen Rothwell Cc: Linux Crypto List , Danny Tsen , Linux Kernel Mailing List , Linux Next Mailing List Subject: [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global Message-ID: References: <20230116112939.0820ff24@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230116112939.0820ff24@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Mon, Jan 16, 2023 at 11:29:39AM +1100, Stephen Rothwell wrote: > Hi all, > > After merging the crypto tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > ERROR: modpost: ".aes_p10_gcm_decrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined! > ERROR: modpost: ".aes_p10_gcm_encrypt" [arch/powerpc/crypto/p10-aes-gcm-crypto.ko] undefined! > > Caused by commits > > cc40379b6e19 ("crypto: p10-aes-gcm - Glue code for AES/GCM stitched implementation") > ca68a96c37eb ("crypto: p10-aes-gcm - An accelerated AES/GCM stitched implementation") Does this patch help? > I have used the crypto tree from next-20230113 for today. > > BTW, that series seems to have been committed in the wrong order - > there are refrerences to files/functions before they are created. Sorry, this patch series was submitted in this order and I didn't pick it up when applying it. ---8<--- _GLOBAL is needed instead of .global on Linux in assembly code. Fixes: cc40379b6e19 ("crypto: p10-aes-gcm - Glue code for AES/GCM stitched implementation") Signed-off-by: Herbert Xu Thanks, diff --git a/arch/powerpc/crypto/p10_aes_gcm.S b/arch/powerpc/crypto/p10_aes_gcm.S index 2306ad7c5e36..c25a1837efca 100644 --- a/arch/powerpc/crypto/p10_aes_gcm.S +++ b/arch/powerpc/crypto/p10_aes_gcm.S @@ -38,6 +38,8 @@ # =================================================================================== # +#include + .machine "any" .abiversion 1 .text @@ -569,9 +571,8 @@ ppc_aes_gcm_ghash: # rounds is at offset 240 in rk # Xi is at 0 in gcm_table (Xip). # -.global aes_p10_gcm_encrypt .align 5 -aes_p10_gcm_encrypt: +_GLOBAL(aes_p10_gcm_encrypt) SAVE_REGS @@ -1109,9 +1110,8 @@ aes_gcm_out: # # 8x Decrypt # -.global aes_p10_gcm_decrypt .align 5 -aes_p10_gcm_decrypt: +_GLOBAL(aes_p10_gcm_decrypt) SAVE_REGS