Message ID | 20230522105257.562cb1ec@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1130342vqo; Sun, 21 May 2023 17:55:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ck44dyCUptYKMYh5Qkf3GwM5mn42KMUz8mYsZDNZqyV5u17V7dKYI9ccgp8OBXcU90bYz X-Received: by 2002:a05:6a20:918f:b0:101:4348:3e44 with SMTP id v15-20020a056a20918f00b0010143483e44mr10055223pzd.12.1684716948789; Sun, 21 May 2023 17:55:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684716948; cv=none; d=google.com; s=arc-20160816; b=dg4+VtVtB+Yw08RKunmtlewE63kBK/xb4uj2BtvRmENfLbRP7dkHqFmF+BAnWAKD9C BugsAo3X1Ls1gA7Vf682p/W/KXViJy4OS/cLeqkga0NJAX3PpZDDOwBjmaEQ2orOx8BJ Z4V0kYVt1kYfcPNaG6BFosx9vxBxJQQ41owDlgA4rjYiCzCRPHeYIYurmSjVgiWIaKk9 1zvW2K4ZTMXyWrUWm6ClxpX3csJpf9oOeF9jUnj+9oH+6NvLHe89Mb3mRSwHcdbe23iH su2Jij/c2YzbkQ6pMxQiWXCS8y+qWrE1Df5MAfPGod7rldqjb049mkZohGGX2GLkTJP3 6whA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=IFZYqtHvmYjXWyTUb3u5yrGNdgE9k+C2KpTXNadRRfc=; b=lazX5rA6zuxyhv1YYaLzw9aDeUM9GT+mHM343uFM6HpvBgo/ArWVy0LMREN5MULKmL C4gu9QLXD980jaTIrEehbYSnHBgH6WzTbIk3UoqDXo2Mx9KupRmZ03E2QKuEyzUd5ELc QRjzWygj120SJkxIxdOC3IWgKppOewVYwZaB6UaqCSwFpPjUhAkf12xqH1gKMfJpLivh NTdbkj5adliducOByN4RJxKGa+JA2pxXUBTFYYyrb9XjVRgXPqmwNggGffZ+SfoG5Wla lHEtrgCg9s9V7MLhFnNz7orQ5PSqMEAU01NrnLBxeFNkBlpmUEE+j+N/ksKgibumr6B2 xpaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WvIsa8rX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w18-20020a639352000000b00534e68cc8f4si1973658pgm.27.2023.05.21.17.55.32; Sun, 21 May 2023 17:55:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WvIsa8rX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbjEVAxM (ORCPT <rfc822;cscallsign@gmail.com> + 99 others); Sun, 21 May 2023 20:53:12 -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 <rfc822;linux-kernel@vger.kernel.org>); 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 <sfr@canb.auug.org.au> To: Herbert Xu <herbert@gondor.apana.org.au>, Linux Crypto List <linux-crypto@vger.kernel.org> Cc: Huan Feng <huan.feng@starfivetech.com>, Jia Jie Ho <jiajie.ho@starfivetech.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: build failure after merge of the crypto tree Message-ID: <20230522105257.562cb1ec@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/rH6GA9i8=s+/RlhPx=6EfaR"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766553759230305216?= X-GMAIL-MSGID: =?utf-8?q?1766553759230305216?= |
Series |
linux-next: build failure after merge of the crypto tree
|
|
Commit Message
Stephen Rothwell
May 22, 2023, 12:52 a.m. UTC
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(-)
Comments
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