ib_sdp: remove APM code

In UEK4, APM support code in rdma_cm has been removed,
so we had to remove all the references to APM APIs in
SDP as well.

Signed-off-by: Qing Huang <qing.huang@oracle.com>
Signed-off-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index 250e5af2194ba5e43028c1ba82eb607438009ad0..fa7a71218d6947bcf6a576bcfcdee1c0577318d1 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -392,7 +392,11 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
        struct sdp_hah hah;
        struct sdp_hh hh;
 
-       int rc = 0, rc2;
+       int rc = 0;
+/* APM support has been removed from rdma_cm */
+#if RDMA_SDP_APM_SUPPORTED
+       int rc2 = 0;
+#endif
 
        sk = id->context;
        if (!sk) {
@@ -477,16 +481,17 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                conn_param.initiator_depth = 4 /* TODO */;
                conn_param.retry_count = sdp_retry_count;
                SDP_DUMP_PACKET(sk, "TX", NULL, &hh.bsdh);
-
+#if RDMA_SDP_APM_SUPPORTED
                if (sdp_apm_enable) {
                        rc = rdma_enable_apm(id, RDMA_ALT_PATH_BEST);
                        if (rc)
                                sdp_warn(sk, "APM couldn't be enabled for active side: %d\n", rc);
                }
-
+#endif
                rc = rdma_connect(id, &conn_param);
                break;
 
+#if RDMA_SDP_APM_SUPPORTED
        case RDMA_CM_EVENT_ALT_ROUTE_RESOLVED:
                sdp_dbg(sk, "alt route was resolved slid=%d, dlid=%d\n",
                                id->route.path_rec[1].slid, id->route.path_rec[1].dlid);
@@ -499,6 +504,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
        case RDMA_CM_EVENT_ALT_ROUTE_ERROR:
                sdp_warn(sk, "alt route resolve error\n");
                break;
+#endif
 
        case RDMA_CM_EVENT_ROUTE_ERROR:
                rc = -ETIMEDOUT;
@@ -535,11 +541,14 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                        id->qp = NULL;
                        id->context = NULL;
                        parent = sdp_sk(child)->parent; /* TODO: hold ? */
-               } else if (sdp_apm_enable) {
+               }
+#if RDMA_SDP_APM_SUPPORTED
+               else if (sdp_apm_enable) {
                                rc2 = rdma_enable_apm(id, RDMA_ALT_PATH_BEST);
                                if (rc2)
                                        sdp_warn(sk, "APM couldn't be enabled for passive side: %d\n", rc2);
                }
+#endif
                break;
        case RDMA_CM_EVENT_CONNECT_RESPONSE:
                rc = sdp_response_handler(sk, id, event);
@@ -548,11 +557,15 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                        rdma_reject(id, NULL, 0);
                } else {
                        rc = rdma_accept(id, NULL);
+#if RDMA_SDP_APM_SUPPORTED
                        if (!rc && sdp_apm_enable) {
                                rc2 = rdma_enable_apm(id, RDMA_ALT_PATH_BEST);
                                if (rc2)
-                                       sdp_warn(sk, "APM couldn't be enabled for passive side:%d \n", rc2);
+                                       sdp_warn(sk,
+                                                "APM couldn't be enabled for passive side:%d\n",
+                                                rc2);
                        }
+#endif
                }
                break;
        case RDMA_CM_EVENT_CONNECT_ERROR:

diff --git a/drivers/infiniband/ulp/sdp/sdp_dbg.h b/drivers/infiniband/ulp/sdp/sdp_dbg.h
index 3526d676ea7108fdfb14283498cfe0824ed5cffb..aa8c38b63669d9d8b43b0c885c460d6bfef0a666 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_dbg.h
+++ b/drivers/infiniband/ulp/sdp/sdp_dbg.h
@@ -1,6 +1,8 @@
 #ifndef _SDP_DBG_H_
 #define _SDP_DBG_H_
 
+#define RDMA_SDP_APM_SUPPORTED 0
+
 #define SDPSTATS_ON
 
 #ifdef CONFIG_INFINIBAND_SDP_DEBUG
@@ -278,8 +280,10 @@ static inline const char* rdma_cm_event_str(int event)
                ENUM2STR(RDMA_CM_EVENT_MULTICAST_ERROR),
                ENUM2STR(RDMA_CM_EVENT_ADDR_CHANGE),
                ENUM2STR(RDMA_CM_EVENT_TIMEWAIT_EXIT),
+#if RDMA_SDP_APM_SUPPORTED
                ENUM2STR(RDMA_CM_EVENT_ALT_ROUTE_RESOLVED),
                ENUM2STR(RDMA_CM_EVENT_ALT_ROUTE_ERROR)
+#endif
        };
 
        if (event < 0 || event >= ARRAY_SIZE(state2str)) {