IB/cm: Update protocol to support XRC

Update the REQ and REP messages to support XRC connection setup
according to the XRC Annex.  Several existing fields must be set to 0 or
1 when connecting XRC QPs, and a reserved field is changed to an
extended transport type.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index 7e63c08f697..3ade3202597 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -86,7 +86,7 @@ struct cm_req_msg {
         __be16 pkey;
         /* path MTU:4, RDC exists:1, RNR retry count:3. */
         u8 offset50;
-        /* max CM Retries:4, SRQ:1, rsvd:3 */
+        /* max CM Retries:4, SRQ:1, extended transport type:3 */
         u8 offset51;
 
         __be16 primary_local_lid;
@@ -175,6 +175,11 @@ static inline enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
         switch(transport_type) {
         case 0: return IB_QPT_RC;
         case 1: return IB_QPT_UC;
+        case 3:
+                switch (req_msg->offset51 & 0x7) {
+                case 1: return IB_QPT_XRC_TGT;
+                default: return 0;
+                }
         default: return 0;
         }
 }
@@ -188,6 +193,12 @@ static inline void cm_req_set_qp_type(struct cm_req_msg *req_msg,
                                                   req_msg->offset40) &
                                                    0xFFFFFFF9) | 0x2);
                 break;
+        case IB_QPT_XRC_INI:
+                req_msg->offset40 = cpu_to_be32((be32_to_cpu(
+                                                 req_msg->offset40) &
+                                                   0xFFFFFFF9) | 0x6);
+                req_msg->offset51 = (req_msg->offset51 & 0xF8) | 1;
+                break;
         default:
                 req_msg->offset40 = cpu_to_be32(be32_to_cpu(
                                                  req_msg->offset40) &