From patchwork Fri Dec 20 20:26:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Upinder Malhi (umalhi)" X-Patchwork-Id: 3391681 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A9FDBC0D4A for ; Fri, 20 Dec 2013 20:27:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0058420666 for ; Fri, 20 Dec 2013 20:27:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 253F420704 for ; Fri, 20 Dec 2013 20:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751296Ab3LTU1O (ORCPT ); Fri, 20 Dec 2013 15:27:14 -0500 Received: from mtv-iport-2.cisco.com ([173.36.130.13]:28577 "EHLO mtv-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063Ab3LTU1L (ORCPT ); Fri, 20 Dec 2013 15:27:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1018; q=dns/txt; s=iport; t=1387571231; x=1388780831; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=hBApKXlNSM51eJUKLnM3kRCmRDEI4CeXrLbxw063IFA=; b=e7ndpFqi+PyCUIdrW1O38PCEaGsPj+JDuOldto7BnvRtaOQ5JPlg/jVD BGBRg/4JtLteXDldfUOO+0nTPskxhn+ZwonXeq7IIWD1UUSEYO9Uzfzhl UTRKmKG5Y+p667McbYEbE05h5D4fNRB6kARmFMP9ucr/gofZnabxAwGX1 k=; X-IronPort-AV: E=Sophos;i="4.95,523,1384300800"; d="scan'208";a="101113183" Received: from mtv-core-3.cisco.com ([171.68.58.8]) by mtv-iport-2.cisco.com with ESMTP; 20 Dec 2013 20:27:10 +0000 Received: from sjc-savbu-bld03.cisco.com (sjc-savbu-bld03.cisco.com [171.71.188.58]) by mtv-core-3.cisco.com (8.14.5/8.14.5) with ESMTP id rBKKR9bT001720; Fri, 20 Dec 2013 20:27:10 GMT Received: by sjc-savbu-bld03.cisco.com (Postfix, from userid 246720) id A71F63F7DB; Fri, 20 Dec 2013 12:27:09 -0800 (PST) From: Upinder Malhi To: linux-rdma@vger.kernel.org, roland@kernel.org Cc: Upinder Malhi Subject: [PATCH for-next 03/15] IB/usnic: Make usNIC built depend on Intel IOMMU Date: Fri, 20 Dec 2013 12:26:34 -0800 Message-Id: <1387571206-8043-4-git-send-email-umalhi@cisco.com> X-Mailer: git-send-email 1.8.0-rc0 In-Reply-To: <1387571206-8043-1-git-send-email-umalhi@cisco.com> References: <1387571206-8043-1-git-send-email-umalhi@cisco.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-15.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, USER_IN_DEF_DKIM_WL autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP usNIC requires Intel IOMMU to be present in order to function correctly. This patch adds a dependency on CONFIG_INTEL_IOMMU of CONFIG_INFINIBAND_USNIC. It also fixes iommu_domain_has_cap not found error that is thrown if usNIC is built with !CONFIG_IOMMU_API. Signed-off-by: Upinder Malhi --- drivers/infiniband/hw/usnic/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/usnic/Kconfig b/drivers/infiniband/hw/usnic/Kconfig index 0f14b6d..2cc8ba0 100644 --- a/drivers/infiniband/hw/usnic/Kconfig +++ b/drivers/infiniband/hw/usnic/Kconfig @@ -1,10 +1,9 @@ config INFINIBAND_USNIC tristate "Verbs support for Cisco VIC" - depends on NETDEVICES && ETHERNET && PCI + depends on NETDEVICES && ETHERNET && PCI && INTEL_IOMMU select ENIC select NET_VENDOR_CISCO select PCI_IOV - select IOMMU_SUPPORT select INFINIBAND_USER_ACCESS ---help--- This is a low-level driver for Cisco's Virtual Interface