From patchwork Fri Jun 19 14:28:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191221 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp622786ilo; Fri, 19 Jun 2020 08:19:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiZk0YfNx0OF2uEzeY+mtBD9InWpd6bNJDOid4NXmS8VTXYjpgf7X9PiTd4Zt8uClK6+9B X-Received: by 2002:a17:906:d963:: with SMTP id rp3mr4295634ejb.326.1592579955648; Fri, 19 Jun 2020 08:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592579955; cv=none; d=google.com; s=arc-20160816; b=f3O7gefMRhWWiHAo+6XDgyq2wCgSLTOQ69bbxYFav8nnh7/djj3QaqfwIufeOSviZ8 vfQuAZKpVNT5myGOgi5wpQp3y/iXBTgmprmElnIYcx6fPuRRTWlAwqTqOHfD/AGxG7PW HaEFGsKlvKJybbAjAnT1jrmJColfdh7EjyAW+f1To+I5dIp/B4ClPdWnyGxBNxovxJ7v FyGfgoKjDg2BcF5orxmqBAtoYbv3M8AQgXk8AfadEGObSnNJ0TGoCwvzXZgA2p1bjmht F7tTlrFpUiLIaV3ZyKyWKg1kv24+j6XRghT2VSbhL1bwg7e/O7/YPCpvUEW454QPusIU jUdA== 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=fnQ/zLE5t4RNAENmk2+aPXFZmGWFwbo+mzDHoq4ELNo=; b=HzWEB4reMhsc8/tRIWKUOzXMgkFtDJxDHaJuo3iudXcF8HawFjriF0BMVR3JLsIRhX touFWx1Ezk3rBqxLeOG6MJP6/gy+DXWIEx1iPVGG5hVwkyfa+9AE+U8VPIKD/MWwiwaj 0OPkbAS4aYt/GWuWUpZUM9D73n45dJq++DUAE/aWvM1iwEdMptaSlVyXZ2Ifq2ztztSS eeG54zuUIxjFg7EVbGbfVPjcG/00A8c9XnIXPJd+I/AB0naSI2j4C878WEs+pbhKshsK hLRNAr91X/HZvWzEpRUAht0EgTXlIocjIbXkaUMxeHDXuLbJfyA+d9vBDFzNVXgjM0qx F+rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iyTKFVp+; 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 s16si3991966ejx.298.2020.06.19.08.19.15; Fri, 19 Jun 2020 08:19:15 -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=iyTKFVp+; 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 S2404138AbgFSPRE (ORCPT + 15 others); Fri, 19 Jun 2020 11:17:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:47712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404132AbgFSPRD (ORCPT ); Fri, 19 Jun 2020 11:17:03 -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 4E45C2158C; Fri, 19 Jun 2020 15:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579822; bh=WEeDvDkZo6MB/KF4kzcZdE3zlcrJdIB/C1My+LZzDtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iyTKFVp+s+0/HNhTJybaoyIwGmUZkwyq2Zvrd8vqVysWa3qW/j2RmLIQc7KdBveba IwBztDZtVjmDoPVRELOHH3VRHPOjhov3EH9oyFTECe4oMroG7yTfAsB7OZU1OUGEDg vFtgEHAKvRPPsjiU+tC8XFWTwgwYq4vmjn+qGu0Q= 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.7 007/376] crypto: ccp -- dont "select" CONFIG_DMADEVICES Date: Fri, 19 Jun 2020 16:28:45 +0200 Message-Id: <20200619141710.710047464@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@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 e0a8bd15aa74..32268e239bf1 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