| Message ID | 20230522105257.562cb1ec@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | linux-next: build failure after merge of the crypto tree | expand |
On Mon, May 22, 2023 at 10:52:57AM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the crypto tree, today's linux-next build (x86_64 > allmodconfig) failed like this: Sorry, a fix is pending and will be pushed out soon. Cheers,
Hi Herbert, On Mon, 22 May 2023 13:15:20 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote: > > On Mon, May 22, 2023 at 10:52:57AM +1000, Stephen Rothwell wrote: > > > > After merging the crypto tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > Sorry, a fix is pending and will be pushed out soon. That did not fix it :-( My fix up patch is now: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 23 May 2023 10:31:28 +1000 Subject: [PATCH] fixup for "crypto: starfive - Add crypto engine support" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/crypto/starfive/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/starfive/Kconfig b/drivers/crypto/starfive/Kconfig index 908c162ba79a..2a15d51534b9 100644 --- a/drivers/crypto/starfive/Kconfig +++ b/drivers/crypto/starfive/Kconfig @@ -4,7 +4,7 @@ config CRYPTO_DEV_JH7110 tristate "StarFive JH7110 cryptographic engine driver" - depends on (SOC_STARFIVE || COMPILE_TEST) && DMADEVICES + depends on SOC_STARFIVE && DMADEVICES select CRYPTO_ENGINE select CRYPTO_HMAC select CRYPTO_SHA256
diff --git a/drivers/crypto/starfive/Kconfig b/drivers/crypto/starfive/Kconfig index be58d1473523..8795b2fddb4e 100644 --- a/drivers/crypto/starfive/Kconfig +++ b/drivers/crypto/starfive/Kconfig @@ -4,7 +4,7 @@ config CRYPTO_DEV_JH7110 tristate "StarFive JH7110 cryptographic engine driver" - depends on SOC_STARFIVE || COMPILE_TEST + depends on SOC_STARFIVE select CRYPTO_ENGINE select CRYPTO_HMAC select CRYPTO_SHA256
Hi all, After merging the crypto tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/tty/serial/amba-pl011.c: In function 'pl011_sgbuf_init': drivers/tty/serial/amba-pl011.c:379:30: error: implicit declaration of function 'phys_to_page'; did you mean 'pfn_to_page'? [-Werror=implicit-function-declaration] 379 | sg_set_page(&sg->sg, phys_to_page(dma_addr), | ^~~~~~~~~~~~ | pfn_to_page drivers/tty/serial/amba-pl011.c:379:30: error: passing argument 2 of 'sg_set_page' makes pointer from integer without a cast [-Werror=int-conversion] 379 | sg_set_page(&sg->sg, phys_to_page(dma_addr), | ^~~~~~~~~~~~~~~~~~~~~~ | | | int In file included from include/linux/kfifo.h:42, from include/linux/tty_port.h:5, from include/linux/tty.h:12, from drivers/tty/serial/amba-pl011.c:25: include/linux/scatterlist.h:136:69: note: expected 'struct page *' but argument is of type 'int' 136 | static inline void sg_set_page(struct scatterlist *sg, struct page *page, | ~~~~~~~~~~~~~^~~~ Caused by commit 42ef0e944b01 ("crypto: starfive - Add crypto engine support") I applied the following patch for today. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 22 May 2023 10:47:38 +1000 Subject: [PATCH] fixup for "crypto: starfive - Add crypto engine support" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/crypto/starfive/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)