From patchwork Thu Jan 9 22:48:14 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: 3463571 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 D8C099F2E9 for ; Thu, 9 Jan 2014 22:48:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D6DE2010B for ; Thu, 9 Jan 2014 22:48:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5099520108 for ; Thu, 9 Jan 2014 22:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbaAIWsa (ORCPT ); Thu, 9 Jan 2014 17:48:30 -0500 Received: from mtv-iport-2.cisco.com ([173.36.130.13]:23235 "EHLO mtv-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756540AbaAIWsZ (ORCPT ); Thu, 9 Jan 2014 17:48:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1935; q=dns/txt; s=iport; t=1389307705; x=1390517305; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=7d5FBKio0bwLO9w0ezNpQ6/PfGsIjLPLTgG5mO4vd1M=; b=gwXA6dyY9fbckSU1uPW/6RZfPnkWUDDdlxZU6RHmMQ5ZtC4LDAt9Qw9V PTAudIXIwlXjVxoOyYs8kUALlBdSxQTyCmkcp9GyweWPCPKUsQk9HicDU f/ufozlD9hnFj9eBMXVYbm+b524zt2pggs1LD1fyk1nkBOuTzzCjXgfeF k=; X-IronPort-AV: E=Sophos;i="4.95,634,1384300800"; d="scan'208";a="102511288" Received: from mtv-core-2.cisco.com ([171.68.58.7]) by mtv-iport-2.cisco.com with ESMTP; 09 Jan 2014 22:48:22 +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 s09MmKhG022412; Thu, 9 Jan 2014 22:48:22 GMT Received: by sjc-savbu-bld03.cisco.com (Postfix, from userid 246720) id 537CE3F588; Thu, 9 Jan 2014 14:48:20 -0800 (PST) From: Upinder Malhi To: linux-rdma@vger.kernel.org, roland@kernel.org Cc: Upinder Malhi Subject: [PATCH v1 for-next 1/6] IB/usnic: Update ABI and Version file for UDP support Date: Thu, 9 Jan 2014 14:48:14 -0800 Message-Id: <1389307699-11545-2-git-send-email-umalhi@cisco.com> X-Mailer: git-send-email 1.8.0-rc0 In-Reply-To: <1389307699-11545-1-git-send-email-umalhi@cisco.com> References: <1389307699-11545-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 Expand the kernel/userspace interface so userspace may push down a socket file descriptor to usNIC. Also, bump up the abi and version numbers. Signed-off-by: Upinder Malhi --- drivers/infiniband/hw/usnic/usnic.h | 4 ++-- drivers/infiniband/hw/usnic/usnic_abi.h | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic.h b/drivers/infiniband/hw/usnic/usnic.h index d741c76..5be13d8 100644 --- a/drivers/infiniband/hw/usnic/usnic.h +++ b/drivers/infiniband/hw/usnic/usnic.h @@ -23,7 +23,7 @@ #define PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC 0x00cf /* User space NIC */ -#define DRV_VERSION "1.0.2" -#define DRV_RELDATE "September 09, 2013" +#define DRV_VERSION "1.0.3" +#define DRV_RELDATE "December 19, 2013" #endif /* USNIC_H_ */ diff --git a/drivers/infiniband/hw/usnic/usnic_abi.h b/drivers/infiniband/hw/usnic/usnic_abi.h index 7eb49f4..730a371 100644 --- a/drivers/infiniband/hw/usnic/usnic_abi.h +++ b/drivers/infiniband/hw/usnic/usnic_abi.h @@ -21,7 +21,7 @@ #define USNIC_ABI_H /* ABI between userspace and kernel */ -#define USNIC_UVERBS_ABI_VERSION 2 +#define USNIC_UVERBS_ABI_VERSION 3 #define USNIC_QP_GRP_MAX_WQS 8 #define USNIC_QP_GRP_MAX_RQS 8 @@ -30,7 +30,8 @@ enum usnic_transport_type { USNIC_TRANSPORT_UNKNOWN = 0, USNIC_TRANSPORT_ROCE_CUSTOM = 1, - USNIC_TRANSPORT_MAX = 2, + USNIC_TRANSPORT_IPV4_UDP = 2, + USNIC_TRANSPORT_MAX = 3, }; struct usnic_transport_spec { @@ -39,9 +40,16 @@ struct usnic_transport_spec { struct { uint16_t port_num; } usnic_roce; + struct { + uint32_t sock_fd; + } udp; }; }; +struct usnic_ib_create_qp_cmd { + struct usnic_transport_spec spec; +}; + /*TODO: Future - usnic_modify_qp needs to pass in generic filters */ struct usnic_ib_create_qp_resp { u32 vfid;