From patchwork Thu Jan 9 22:47:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Upinder Malhi (umalhi)" X-Patchwork-Id: 3463471 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F33149F3A0 for ; Thu, 9 Jan 2014 22:48:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5170F20103 for ; Thu, 9 Jan 2014 22:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 795EB20108 for ; Thu, 9 Jan 2014 22:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756493AbaAIWsJ (ORCPT ); Thu, 9 Jan 2014 17:48:09 -0500 Received: from mtv-iport-3.cisco.com ([173.36.130.14]:60855 "EHLO mtv-iport-3.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756165AbaAIWr7 (ORCPT ); Thu, 9 Jan 2014 17:47:59 -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=1389307679; x=1390517279; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=hBApKXlNSM51eJUKLnM3kRCmRDEI4CeXrLbxw063IFA=; b=NJJt21Pa57Hj3Kze6VdBJFMuyUBzKBgbgipGwySZeGRzja3rTk+BUa0Z BzOOy5nUetods142QrUVGaCD7a4xBPj0bHD6509ZXl7kmSEo0/281iHWE GRHWWT2zjazD3zQj0a31hrR2eZNhGkHthG7p2aRWZ1rgMQC70B6g68EZo o=; X-IronPort-AV: E=Sophos;i="4.95,634,1384300800"; d="scan'208";a="99936703" Received: from mtv-core-2.cisco.com ([171.68.58.7]) by mtv-iport-3.cisco.com with ESMTP; 09 Jan 2014 22:47:57 +0000 Received: from sjc-savbu-bld03.cisco.com (sjc-savbu-bld03.cisco.com [171.71.188.58]) by mtv-core-2.cisco.com (8.14.5/8.14.5) with ESMTP id s09Mlubo022148; Thu, 9 Jan 2014 22:47:57 GMT Received: by sjc-savbu-bld03.cisco.com (Postfix, from userid 246720) id ECE0E3F7CD; Thu, 9 Jan 2014 14:47:56 -0800 (PST) From: Upinder Malhi To: linux-rdma@vger.kernel.org, roland@kernel.org Cc: Upinder Malhi Subject: [PATCH v1 for-next 03/15] IB/usnic: Make usNIC built depend on Intel IOMMU Date: Thu, 9 Jan 2014 14:47:31 -0800 Message-Id: <1389307663-11296-4-git-send-email-umalhi@cisco.com> X-Mailer: git-send-email 1.8.0-rc0 In-Reply-To: <1389307663-11296-1-git-send-email-umalhi@cisco.com> References: <1389307663-11296-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=-14.5 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