From patchwork Fri Jun 19 14:32:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191209 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp595775ilo; Fri, 19 Jun 2020 07:48:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHTjuoOhKpvrnYBB76NIqMo+GKinB+tb9FdFIpRCKp82xWmzosOvpNtkkfbV+FpztrZsKE X-Received: by 2002:aa7:da17:: with SMTP id r23mr3787465eds.261.1592578094177; Fri, 19 Jun 2020 07:48:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592578094; cv=none; d=google.com; s=arc-20160816; b=GUuZtggal33wlllwykE8E1bqVywDl/m5o8rBiYy9mwvEqMdr4/Pijlco9gS+2uuBSU d1ZyfllmRW7BNA98lYuzQRiv08McJ5flKl4rkiVRG4LWMTMmGuUV9G49wtwfegWdRyND 8C7/1FhBxugFkY+4JCIf8iPPGBUtMktsZ5ZrCKh8l3mIFPkTJPjm+sp6SJbEzqa3uLx9 NLe0GosEqzYxi1bholJGy0v6pKhXxD/DS/Zff/3yk5OABrZ1VxlYCRAjZKJ9t/ATrcVO t4UCNV5ms9CwnLo7nmTqbrGjJBrni5a7o90MTnUQjid0/yr+D+B8/wbu9HjXOj+0SVM7 FlhA== 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=74tgqPSQ7iIzXNjYIzhVjN2spT0LrO4eleHtzz8Zj1E=; b=A8LubFJPaDCn8qbLmLxrmhd4hjdiE7MCnwb37BR0rIauKOU8nfxJ1O2JZur6qFe4F1 Ka7OI4k2Dc8yd1DlOHmKOvblXQ7eZp/dI1/53A91CgIFc7ZF2UhKHS7EPSgSuDaZSQMy mSH3NXcpDW+y3QGCrmrlvTz3ILoOAf7ItHytPiTnoAm3VPLduRAC2wOCCL/LTLEY5kEc a+B4uZFobG0y1Gy3ri/sWW1KLceZ668+lhtJpJKggEz8wTimZ7cBUVCBXilbpp9RnvgT d+UQbQ94LbrTkYECGW1nuzO9PN/HkfukuqL4T+jjIni9UpdHfPdpbRpCF5BJc3BLFwA8 1a4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="pF+sUIL/"; 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 ca19si3980299edb.341.2020.06.19.07.48.13; Fri, 19 Jun 2020 07:48:14 -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="pF+sUIL/"; 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 S2388957AbgFSOsM (ORCPT + 15 others); Fri, 19 Jun 2020 10:48:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:40308 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389050AbgFSOsG (ORCPT ); Fri, 19 Jun 2020 10:48:06 -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 522CF20DD4; Fri, 19 Jun 2020 14:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592578085; bh=0FHpN1EHSVTg7MDnWTWFsKSpU17oCBDRoxafwMs6u4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pF+sUIL/xIs3R0k5va+4n6T36ScagAeBYGQEWb7KfXX4Alij3Hx9uH0lX67ZwxXA6 GKb/XfD4MvM0Jww4JjeOdE64t20u864W81xs+RS5xTif4BYeKI4L9NmV2qPs9arH3s VtlfpRlyYWyDFHuAegLHDYioh4UucmhY5JiGGDFY= 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.14 077/190] crypto: ccp -- dont "select" CONFIG_DMADEVICES Date: Fri, 19 Jun 2020 16:32:02 +0200 Message-Id: <20200619141637.435306275@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141633.446429600@linuxfoundation.org> References: <20200619141633.446429600@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 6d626606b9c5..898dcf3200c3 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -8,10 +8,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