From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
Simplify QP type to/from wire protocol logic and move it to be near
implementation and not in header file.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
drivers/infiniband/core/cm.c | 25 +++++++++++++++++++++
drivers/infiniband/core/cm_msgs.h | 37 -------------------------------
2 files changed, 25 insertions(+), 37 deletions(-)
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4e5c2ad1532e..17954b71cf09 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -1247,6 +1247,20 @@ static void cm_format_mad_hdr(struct ib_mad_hdr *hdr,
hdr->tid = tid;
}
+static void cm_req_set_qp_type(struct cm_req_msg *req_msg,
+ enum ib_qp_type qp_type)
+{
+ static const u8 qp_types[IB_QPT_MAX] = {
+ [IB_QPT_UC] = 1,
+ [IB_QPT_XRC_INI] = 3,
+ };
+
+ if (qp_type == IB_QPT_XRC_INI)
+ CM_SET(REQ_EXTENDED_TRANSPORT_TYPE, req_msg, 0x1);
+
+ CM_SET(REQ_TRANSPORT_SERVICE_TYPE, req_msg, qp_types[qp_type]);
+}
+
static void cm_format_req(struct cm_req_msg *req_msg,
struct cm_id_private *cm_id_priv,
struct ib_cm_req_param *param)
@@ -1645,6 +1659,17 @@ static void cm_opa_to_ib_sgid(struct cm_work *work,
}
}
+static enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
+{
+ static const enum ib_qp_type qp_type[] = { IB_QPT_RC, IB_QPT_UC, 0, 0 };
+ u8 transport_type = CM_GET(REQ_TRANSPORT_SERVICE_TYPE, req_msg);
+
+ if (transport_type == 3 &&
+ (CM_GET(REQ_EXTENDED_TRANSPORT_TYPE, req_msg) == 1))
+ return IB_QPT_XRC_TGT;
+ return qp_type[transport_type];
+}
+
static void cm_format_req_event(struct cm_work *work,
struct cm_id_private *cm_id_priv,
struct ib_cm_id *listen_id)
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index 955a9a5ceeb7..e073308dad09 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -400,43 +400,6 @@ struct cm_req_msg {
} __packed;
-static inline enum ib_qp_type cm_req_get_qp_type(struct cm_req_msg *req_msg)
-{
- u8 transport_type = (u8) (be32_to_cpu(req_msg->offset40) & 0x06) >> 1;
- 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;
- }
-}
-
-static inline void cm_req_set_qp_type(struct cm_req_msg *req_msg,
- enum ib_qp_type qp_type)
-{
- switch(qp_type) {
- case IB_QPT_UC:
- req_msg->offset40 = cpu_to_be32((be32_to_cpu(
- 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) &
- 0xFFFFFFF9);
- }
-}
-
static inline u8 cm_req_get_flow_ctrl(struct cm_req_msg *req_msg)
{
return be32_to_cpu(req_msg->offset40) & 0x1;
--
2.20.1
