From patchwork Sun Jan 3 14:01:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 356152 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp14272403jai; Sun, 3 Jan 2021 06:03:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEGCTlkXVQLYqXzrSgmm4sxloZYJ5zSoYB/kCWlBCbu0mVpnVvVJ8n9bDU7rF5amUU9bpi X-Received: by 2002:a17:906:4fcd:: with SMTP id i13mr437389ejw.455.1609682586686; Sun, 03 Jan 2021 06:03:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609682586; cv=none; d=google.com; s=arc-20160816; b=OG0BERvGUwv2pWIH2qCIRmrynVsx8fQPj/eh1Zafpl93VgAf8s3/HtFdGAuXCAYJAo kJP2+ZB/8HI78zCFtUrMQuP03PRWNVVbi2aUgcqnfGvaxE8rI3Mil8Fzco/av5gjuN6W upHjxH2H+84kkcyGvYYxYodsAX3Yb72q8h0sjSg6czc/PzTpwKY7HU+bd/Il+/aV+G/X XHPPETK7nPtHkehIqWD7rtz/WKwTdUYeCWZ6ALMUW2dgs/Ojk+/ZbjHHGCepmnrFeXjI zjhrkaZ3jH5zbEtZmInB+9zKh+paUei368VpogvMhiQPttHlzv+2Ci2IPsPousook3AG O6eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SrcyflCL41fxPNiwEk32LT9j+tI77uorRkeLrs07Zlo=; b=bbNt9SSrcuNBInaD1Jws17YvVGPKutMF33ZJlCxfrblxAtVFv2EIZWJBS2m5GybErv +KRpiEPE4f6zFNQfHcr9amwCy08oMLJphvy9ynK5bycN6SFgide5yVaBXR4coaafFmhX Py79GQloIwQzSaafu0oJzccIuO6xL5wt0ShmdRYAxrbPT0R8I9/ZJ/zpzPE4xvUPxL4d mhagvBI4Q+YYAihXCAGwQ7FmylSCtss1QXkWCbN2tGRvHMS5U8D429TfPZdjzPqJG7s+ tMK8D2I56E2Iv6H8ch2Hnq//H6lGk+9dxD06SnqPkSq7thxYDk4k4bv61WJZhlmtxRiC rAzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Q++ihx9m; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x2si27358668ejb.174.2021.01.03.06.03.06 for ; Sun, 03 Jan 2021 06:03:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-scsi-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=k20201202 header.b=Q++ihx9m; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727210AbhACOCT (ORCPT ); Sun, 3 Jan 2021 09:02:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:35712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727017AbhACOCQ (ORCPT ); Sun, 3 Jan 2021 09:02:16 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8F04C20DD4; Sun, 3 Jan 2021 14:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609682496; bh=uUni1/Aqw9CBQn9Kex9LuQx8WFY9zqEj+5DF5sCkPKU=; h=From:To:Cc:Subject:Date:From; b=Q++ihx9m/buJ6ab1NZY0gl95lUr2f/n3xg1b25LhzX2JPlM3wHE1dvl65Jbwt9w4H YXMEnIeBqhtjsIs6kku0AOFp+T+4Q/vcLiNJvcSqrJ9SPOddDFzVaZX1us9GI0QghC ENk2ql5AZpHnny2SdAn+7qzPJcinFxWtvVp7OGmCvE6UCMmXRsYE3zQZFtbvwEoi+Y /GiCQrKf57ZKN8FSRa5p+U2RbtSnpQ/dbIDh3CpunkuPKObSVHqvS1GkTQLwYfymMq xEhxk3AmGrQps3tCCtUs+0mjOTpadT/uY88DZ/VS9DNPAaQnNsPLCS9slaq1x+NyYo 3H7T/a3Qnz6vA== From: Arnd Bergmann To: Karen Xie , "James E.J. Bottomley" , "Martin K. Petersen" , Jakub Kicinski , Tom Seewald Cc: Arnd Bergmann , Randy Dunlap , Masahiro Yamada , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cxgb4: fix TLS dependencies again Date: Sun, 3 Jan 2021 15:01:26 +0100 Message-Id: <20210103140132.3866665-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Arnd Bergmann A previous patch tried to avoid a build failure, but missed one case that Kconfig warns about: WARNING: unmet direct dependencies detected for CHELSIO_T4 Depends on [m]: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CHELSIO [=y] && PCI [=y] && (IPV6 [=y] || IPV6 [=y]=n) && (TLS [=m] || TLS [=m]=n) Selected by [y]: - SCSI_CXGB4_ISCSI [=y] && SCSI_LOWLEVEL [=y] && SCSI [=y] && PCI [=y] && INET [=y] && (IPV6 [=y] || IPV6 [=y]=n) && ETHERNET [=y] x86_64-linux-ld: drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.o: in function `cxgb_select_queue': cxgb4_main.c:(.text+0xf5df): undefined reference to `tls_validate_xmit_skb' When any of the dependencies of CHELSIO_T4 are not met, then SCSI_CXGB4_ISCSI must not 'select' it either. Fix it by mirroring the network driver dependencies on the iscsi driver. A more invasive but also more reliable alternative would be to use 'depends on CHELSIO_T4' instead. Fixes: 659fbdcf2f14 ("cxgb4: Fix build failure when CONFIG_TLS=m") Signed-off-by: Arnd Bergmann --- drivers/scsi/cxgbi/cxgb4i/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig index 8b0deece9758..2af88a55fbca 100644 --- a/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" - depends on PCI && INET && (IPV6 || IPV6=n) + depends on PCI && INET && (IPV6 || IPV6=n) && (TLS || TLS=n) depends on THERMAL || !THERMAL depends on ETHERNET depends on TLS || TLS=n