From patchwork Fri Jun 19 14:31:20 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: 191212 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp602697ilo; Fri, 19 Jun 2020 07:57:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygTCykp4Z8JD2X9/DeZCWR+yXVpC/+EIE3xz5fx2bX/y9gEQDFM9zZguma9jk1JlaHjH18 X-Received: by 2002:a17:907:2162:: with SMTP id rl2mr3758075ejb.365.1592578632307; Fri, 19 Jun 2020 07:57:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592578632; cv=none; d=google.com; s=arc-20160816; b=MO3Qx/ACivM6Txu8CKL8yBjhn3uHl/cc5XIXd1yOb+IHBMmRg7dcxIJYLCNMglCof0 XWdh/MQGvgNBA1mS7TPuP1T8KCBIoOwKiUobqoPm4RmqNPSlWFykN84vxMlosrEDatRz tcOAijzQeObog9mtsszPqja2dLvpfEgEzWPAJV43mp34CsMv5qxJ/NM0VN0Xoipfcs6M ePdRJT7YLb8radR8AZIm9LK2fSVShrq5atowM3grnb6QxEFZ6D+sEhr3Q1eOXix+3Azp O/Gpk985z2nhBDDXeAo5DJGvvcerDEW13ICmMkoh3I+xPSX9nVbPP3ux1yCNVjfbDI53 VQig== 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=NlScLkTB7LR02UpbWS4G1vr8Lnup/kHFrE7hL/NeePk=; b=B1uxqx3D8FaA+WMoFdQkPCuGFwxgLLiz5mZnCrBT7KQuBWtcSFEK2pFHiqMIT33Jzy NBchEMxwFvT6UaPtql9pzSXQccNzvkbzAr8QBCGWHACb1PAZ0Mf2A4/S6jXPVFreTnJ9 4i4QP5TFxPMgnmo0a9bUB6Zoo5Q8hYqlQKJ2a34ufwmgz/4bRFyolIk36btBlpYDFZp6 u0ihQ9caeF9C4pYMCnBumgH7fruhVmOYjb70WfKgJuVhaZEjr5VLCPT/6il0NN4hzkLd Ok4ixcY37q1+KnXIQi1X7nCZWBNfAVXXdeTtKoZ2PmcjliFDAXr324oPjk07bnufwbDS ycdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SID9elaY; 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 c19si3455906ejp.127.2020.06.19.07.57.12; Fri, 19 Jun 2020 07:57:12 -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=SID9elaY; 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 S2390186AbgFSO5J (ORCPT + 15 others); Fri, 19 Jun 2020 10:57:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:52368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389814AbgFSO5I (ORCPT ); Fri, 19 Jun 2020 10:57:08 -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 0CB44217D8; Fri, 19 Jun 2020 14:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578627; bh=yKkzUylOknIwecsv8r1l0CYmrdBOv5/1gOFSrHKSh6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SID9elaY/sT1R3TMBFrFgtt7IVyWZAwuY/znCyMI/xgEkiZ/DxgEp8sLL/PMPehTU tKDmUi+X37S5XPCI7m9WnETzJlNMmTx5EQUz4QCVO2Mg4/n70GrCQW5/EIyaepkImx ZgdQqcGKr/04q063O/6P91E1TJxFJNcwI8Qlahxk= 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 4.19 095/267] crypto: ccp -- dont "select" CONFIG_DMADEVICES Date: Fri, 19 Jun 2020 16:31:20 +0200 Message-Id: <20200619141653.427883679@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141648.840376470@linuxfoundation.org> References: <20200619141648.840376470@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 b9dfae47aefd..7f5fc705503d 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -9,10 +9,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