From patchwork Mon May 22 00:52:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 684767 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 0408EC77B7C for ; Mon, 22 May 2023 00:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjEVAxL (ORCPT ); Sun, 21 May 2023 20:53:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjEVAxK (ORCPT ); Sun, 21 May 2023 20:53:10 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 623A6DB; Sun, 21 May 2023 17:53:05 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QPf7b1gR0z4x1N; Mon, 22 May 2023 10:52:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684716779; bh=IFZYqtHvmYjXWyTUb3u5yrGNdgE9k+C2KpTXNadRRfc=; h=Date:From:To:Cc:Subject:From; b=WvIsa8rX4BVKDXM9ObGvkekHGa2tqVL2CluTAGqKnXYKXkeTX91DQrhWd4UFkBpAP 50A9cLjMa+Hk7X+eYPDTkn+0t2321Iy8JAu+dpHXT8O6b2qHvBqihN/RuG0gwehaJV knTX7ksD20z/VchTeOibNpJNdqZQoFWZHEc50c/9conRFP3DFGpiNIZd/GCSbSNTk9 NHx6/bXYSU6u5uTnwXZsZIYBsiTL1tvlF/866+UXrNktK0VBy0R4jBGhqcALNc7aNa s4w/rlNRboa8RyM1TllUCXKScAxUxxQsi95gW3iIiKHrb5l0lHGJFj8xgOfbGSPEh7 +PFNQ0cxb8mhQ== Date: Mon, 22 May 2023 10:52:57 +1000 From: Stephen Rothwell To: Herbert Xu , Linux Crypto List Cc: Huan Feng , Jia Jie Ho , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the crypto tree Message-ID: <20230522105257.562cb1ec@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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 Date: Mon, 22 May 2023 10:47:38 +1000 Subject: [PATCH] fixup for "crypto: starfive - Add crypto engine support" Signed-off-by: Stephen Rothwell Signed-off-by: Stephen Rothwell Reviewed-by: Conor Dooley --- 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 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