* linux-next: build failure after merge of the crypto tree
@ 2023-01-16 0:29 Stephen Rothwell
2023-01-16 9:17 ` [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global Herbert Xu
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-16 0:29 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto List
Cc: Danny Tsen, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
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")
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global
2023-01-16 0:29 linux-next: build failure after merge of the crypto tree Stephen Rothwell
@ 2023-01-16 9:17 ` Herbert Xu
2023-01-17 0:02 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Herbert Xu @ 2023-01-16 9:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Crypto List, Danny Tsen, Linux Kernel Mailing List,
Linux Next Mailing List
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 <herbert@gondor.apana.org.au>
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 <asm/ppc_asm.h>
+
.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
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global
2023-01-16 9:17 ` [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global Herbert Xu
@ 2023-01-17 0:02 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-17 0:02 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto List, Danny Tsen, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
Hi Herbert,
On Mon, 16 Jan 2023 17:17:19 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> On Mon, Jan 16, 2023 at 11:29:39AM +1100, Stephen Rothwell wrote:
> >
> > 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?
Yes, that fixes the PowerPC build, thanks.
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au> # build test only
I have added the patch to linux-next for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-17 0:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-16 0:29 linux-next: build failure after merge of the crypto tree Stephen Rothwell
2023-01-16 9:17 ` [PATCH] crypto: p10-aes-gcm - Use _GLOBAL instead of .global Herbert Xu
2023-01-17 0:02 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).