From: Upinder Malhi <umalhi@cisco.com>
Date: Thu, 9 Jan 2014 22:48:14 +0000 (-0800)
Subject: IB/usnic: Update ABI and Version file for UDP support
X-Git-Tag: upstream/snapshot3+hdmi~3581^2~1^11~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b85caf479b577f000067002259539ad4341d4530;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

IB/usnic: Update ABI and Version file for UDP support

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 <umalhi@cisco.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
---

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 dd3e4c6..014bcfc 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;