From patchwork Fri Jun 19 14:30:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191244 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp667811ilo; Fri, 19 Jun 2020 09:11:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFU4RTmN1i3soW9fyGs03lAbc4oHDDGlCtngted85oaw18FU3c9tcWg0pBEo34ntOQ9vjb X-Received: by 2002:a17:906:f6d6:: with SMTP id jo22mr4226338ejb.310.1592583095310; Fri, 19 Jun 2020 09:11:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592583095; cv=none; d=google.com; s=arc-20160816; b=w4pWMYFhG6G4Mo7919Yb4lLQeMHoE4pP3BhK+XvTqVp+vYlleGBYjw52CyFwUppKal pcl5IoqrHWlWAZhRMReJ33fbcqxOcFepvDlIsuX/CDIBRFvoMDPJIIqSjkptNvEic1oo LdABGvb9CRNHYJcjSyc+9tLMEKX9J8WHFC1825rIjISQidtEcXxIPTYrdWQpxgUQQ8n/ 3iiW1hh9ihvypREq+eXJZGv+XGhboE6FK2FlkzaNAgC9KDqo1P/OWCnAqIgg8gILnIgP KOHHroFMcC5tSxCemvuBZbgqH0IG+49h/1x14n052HaU78gOfbpT4wEJ9map9PONnKRS b21A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xDeQLJSZ3emTq/BnY3uh247sKst9pD/OpuY+R3BP0jM=; b=vSZXGh8qkQDlAZrwRqbVfQEkwmSoEfYgkjMRTzauYBRp/HvWaCATFSUv4unOu1BC+k j0NJmWWQu+lIwwHa62esrexZrUsEwiHOraO0Pvqa9EVdTc6SmXyWNitqTARRMYVqHcSG X9j+6NLrPQcHr8S7v3BXyUix94xMWF8zzEzFWkqEuLLIxOhx+PW8Vdz+nR1DFuQDEfe6 LKTgqrU1eYIYrBbFTGW2GNiwp59gHyLjZMfw0wBBdG9RZNtvo+aTA5lyZAaLk6/x8DrF BK0uwZ/7Nx07c8Pw2gigDAvFBQXG2N8d8xKzRecc2JZEsSztpRh0+L6hksAnc6MWc8O3 OfFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bjs+Ux9o; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i8si3911421ejz.15.2020.06.19.09.11.35; Fri, 19 Jun 2020 09:11:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bjs+Ux9o; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391362AbgFSPFz (ORCPT + 15 others); Fri, 19 Jun 2020 11:05:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:34886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391356AbgFSPFy (ORCPT ); Fri, 19 Jun 2020 11:05:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DBA1E21841; Fri, 19 Jun 2020 15:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579153; bh=1ZqBWfgeh7FOkLqgoKPI+U9m04VMyCuq7dbiqJMlu9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bjs+Ux9oTaJdgr7YmjoWcPfFHUuVHLy0PNI1vZYAuTENLUVX0FYRrL6BstiYNFhzm DuSpJZfb/x1YP8Yba1EjEk3WSS5J9CKgt/XcxoS/jyfAUqrkkP0gCeUGywP29lAMiv 1tq/cDUDWzZMIcWGj1NeV1478rVuIViCYClA1Skw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Tom Lendacky , Herbert Xu , Sasha Levin Subject: [PATCH 5.4 007/261] crypto: ccp -- dont "select" CONFIG_DMADEVICES Date: Fri, 19 Jun 2020 16:30:18 +0200 Message-Id: <20200619141650.244907382@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit eebac678556d6927f09a992872f4464cf3aecc76 ] DMADEVICES is the top-level option for the slave DMA subsystem, and should not be selected by device drivers, as this can cause circular dependencies such as: drivers/net/ethernet/freescale/Kconfig:6:error: recursive dependency detected! drivers/net/ethernet/freescale/Kconfig:6: symbol NET_VENDOR_FREESCALE depends on PPC_BESTCOMM drivers/dma/bestcomm/Kconfig:6: symbol PPC_BESTCOMM depends on DMADEVICES drivers/dma/Kconfig:6: symbol DMADEVICES is selected by CRYPTO_DEV_SP_CCP drivers/crypto/ccp/Kconfig:10: symbol CRYPTO_DEV_SP_CCP depends on CRYPTO crypto/Kconfig:16: symbol CRYPTO is selected by LIBCRC32C lib/Kconfig:222: symbol LIBCRC32C is selected by LIQUIDIO drivers/net/ethernet/cavium/Kconfig:65: symbol LIQUIDIO depends on PTP_1588_CLOCK drivers/ptp/Kconfig:8: symbol PTP_1588_CLOCK is implied by FEC drivers/net/ethernet/freescale/Kconfig:23: symbol FEC depends on NET_VENDOR_FREESCALE The LIQUIDIO driver causing this problem is addressed in a separate patch, but this change is needed to prevent it from happening again. Using "depends on DMADEVICES" is what we do for all other implementations of slave DMA controllers as well. Fixes: b3c2fee5d66b ("crypto: ccp - Ensure all dependencies are specified") Signed-off-by: Arnd Bergmann Acked-by: Tom Lendacky Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/ccp/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 8fec733f567f..63e227adbb13 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -10,10 +10,9 @@ config CRYPTO_DEV_CCP_DD config CRYPTO_DEV_SP_CCP bool "Cryptographic Coprocessor device" default y - depends on CRYPTO_DEV_CCP_DD + depends on CRYPTO_DEV_CCP_DD && DMADEVICES select HW_RANDOM select DMA_ENGINE - select DMADEVICES select CRYPTO_SHA1 select CRYPTO_SHA256 help