From patchwork Tue Sep 10 03:39:35 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: 2863891 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 C3D34BF43F for ; Tue, 10 Sep 2013 03:39:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBB9C201EC for ; Tue, 10 Sep 2013 03:39:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C65292018A for ; Tue, 10 Sep 2013 03:39:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751721Ab3IJDjh (ORCPT ); Mon, 9 Sep 2013 23:39:37 -0400 Received: from rcdn-iport-3.cisco.com ([173.37.86.74]:1925 "EHLO rcdn-iport-3.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553Ab3IJDjg convert rfc822-to-8bit (ORCPT ); Mon, 9 Sep 2013 23:39:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=3132; q=dns/txt; s=iport; t=1378784376; x=1379993976; h=from:to:cc:subject:date:message-id:content-id: content-transfer-encoding:mime-version; bh=z7UEy0KEDLM5h0ZfUDxDHowAGDtPCIlFpRGpFQKFd+U=; b=jvw8/JtFEL0ZI+dB7Vyd4u7u6FHAFc2YVnM8bh+IbJt+jkL4E7Dubhrr M7Rv2/wKCay56g4KusqhXtiDBs1JBfCfJAzlDvtEIhCW01g8v24BW5qcw bM+L6RgO2/xQXHL8/Y7l8P6wpaIdBrHy79f0rwiK11LBnwmRjlN5nE1Vd E=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsoFAOqTLlKtJV2Y/2dsb2JhbABbgweBCcIrgSoWbQeCJwEEOj8SASoUQicEDgUIh3rCfY86MYMkgQADqVuDIIIq X-IronPort-AV: E=Sophos;i="4.90,875,1371081600"; d="scan'208";a="257632201" Received: from rcdn-core-1.cisco.com ([173.37.93.152]) by rcdn-iport-3.cisco.com with ESMTP; 10 Sep 2013 03:39:36 +0000 Received: from xhc-aln-x10.cisco.com (xhc-aln-x10.cisco.com [173.36.12.84]) by rcdn-core-1.cisco.com (8.14.5/8.14.5) with ESMTP id r8A3daqj011849 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 10 Sep 2013 03:39:36 GMT Received: from xmb-rcd-x09.cisco.com ([169.254.9.162]) by xhc-aln-x10.cisco.com ([173.36.12.84]) with mapi id 14.02.0318.004; Mon, 9 Sep 2013 22:39:35 -0500 From: "Upinder Malhi (umalhi)" To: "roland@purestorage.com" CC: "linux-rdma@vger.kernel.org" Subject: [PATCH V2 4/4] IB/usnic: Cisco VIC - driver part 3/3 Thread-Topic: [PATCH V2 4/4] IB/usnic: Cisco VIC - driver part 3/3 Thread-Index: AQHOrddeS85nYeMuwEWoKC0sZmx9pQ== Date: Tue, 10 Sep 2013 03:39:35 +0000 Message-ID: <47A33601BBFF7E4B8F0D5D0C96F3022C013CF3AE@xmb-rcd-x09.cisco.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.89.15.35] Content-ID: <59DFF029E1C6CF4CB134CA7E376DF847@emea.cisco.com> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY 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 Signed-off-by: Upinder Malhi --- MAINTAINERS | 5 +++++ drivers/infiniband/Kconfig | 1 + drivers/infiniband/Makefile | 1 + drivers/infiniband/hw/usnic/Kconfig | 11 +++++++++++ drivers/infiniband/hw/usnic/Makefile | 15 +++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 drivers/infiniband/hw/usnic/Kconfig create mode 100644 drivers/infiniband/hw/usnic/Makefile -- 1.8.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/MAINTAINERS b/MAINTAINERS index defc053..ff41f0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2077,6 +2077,11 @@ M: Nishank Trivedi S: Supported F: drivers/net/ethernet/cisco/enic/ +CISCO VIC LOW LATENCY NIC DRIVER +M: Upinder Malhi +S: Supported +F: drivers/infiniband/hw/usnic + CIRRUS LOGIC EP93XX ETHERNET DRIVER M: Hartley Sweeten L: netdev@vger.kernel.org diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 5ceda71..10219ee9 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -53,6 +53,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig" source "drivers/infiniband/hw/mlx5/Kconfig" source "drivers/infiniband/hw/nes/Kconfig" source "drivers/infiniband/hw/ocrdma/Kconfig" +source "drivers/infiniband/hw/usnic/Kconfig" source "drivers/infiniband/ulp/ipoib/Kconfig" diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile index 1fe6988..bf508b5 100644 --- a/drivers/infiniband/Makefile +++ b/drivers/infiniband/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ obj-$(CONFIG_MLX5_INFINIBAND) += hw/mlx5/ obj-$(CONFIG_INFINIBAND_NES) += hw/nes/ obj-$(CONFIG_INFINIBAND_OCRDMA) += hw/ocrdma/ +obj-$(CONFIG_INFINIBAND_USNIC) += hw/usnic/ obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ diff --git a/drivers/infiniband/hw/usnic/Kconfig b/drivers/infiniband/hw/usnic/Kconfig new file mode 100644 index 0000000..0f14b6d --- /dev/null +++ b/drivers/infiniband/hw/usnic/Kconfig @@ -0,0 +1,11 @@ +config INFINIBAND_USNIC + tristate "Verbs support for Cisco VIC" + depends on NETDEVICES && ETHERNET && PCI + 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 + Cards (VICs), including the VIC 1240 and 1280 cards. diff --git a/drivers/infiniband/hw/usnic/Makefile b/drivers/infiniband/hw/usnic/Makefile new file mode 100644 index 0000000..99fb2db --- /dev/null +++ b/drivers/infiniband/hw/usnic/Makefile @@ -0,0 +1,15 @@ +ccflags-y := -Idrivers/net/ethernet/cisco/enic + +obj-$(CONFIG_INFINIBAND_USNIC)+= usnic_verbs.o + +usnic_verbs-y=\ +usnic_fwd.o \ +usnic_transport.o \ +usnic_uiom.o \ +usnic_uiom_interval_tree.o \ +usnic_vnic.o \ +usnic_ib_main.o \ +usnic_ib_qp_grp.o \ +usnic_ib_sysfs.o \ +usnic_ib_verbs.o \ +usnic_debugfs.o \