IB/Verbs: Use management helper rdma_cap_ib_mad()

Introduce helper rdma_cap_ib_mad() to help us check if the port of an
IB device support Infiniband Management Datagrams.

Signed-off-by: Michael Wang <yun.wang@profitbricks.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Tested-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Sean Hefty <sean.hefty@intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 507eb67d14ccbc0c1572ef427678c047eca82122..80777cdaacccda93fa570cbdf0e509cc54ce03c6 100644 (file)
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -3066,7 +3066,7 @@ static void ib_mad_init_device(struct ib_device *device)
        }
 
        for (i = start; i <= end; i++) {
-               if (!rdma_ib_or_iboe(device, i))
+               if (!rdma_cap_ib_mad(device, i))
                        continue;
 
                if (ib_mad_port_open(device, i)) {
@@ -3087,7 +3087,7 @@ error_agent:
 
 error:
        while (--i >= start) {
-               if (!rdma_ib_or_iboe(device, i))
+               if (!rdma_cap_ib_mad(device, i))
                        continue;
 
                if (ib_agent_port_close(device, i))
@@ -3111,7 +3111,7 @@ static void ib_mad_remove_device(struct ib_device *device)
        }
 
        for (i = start; i <= end; i++) {
-               if (!rdma_ib_or_iboe(device, i))
+               if (!rdma_cap_ib_mad(device, i))
                        continue;
 
                if (ib_agent_port_close(device, i))

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index aa8b334c8dce8f2afd8467d2bc1962a17a59eaac..d451717047db82ca1a237edbf189ad4071961ea4 100644 (file)
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1294,7 +1294,7 @@ static void ib_umad_add_one(struct ib_device *device)
        umad_dev->end_port   = e;
 
        for (i = s; i <= e; ++i) {
-               if (!rdma_ib_or_iboe(device, i))
+               if (!rdma_cap_ib_mad(device, i))
                        continue;
 
                umad_dev->port[i - s].umad_dev = umad_dev;
@@ -1315,7 +1315,7 @@ static void ib_umad_add_one(struct ib_device *device)
 
 err:
        while (--i >= s) {
-               if (!rdma_ib_or_iboe(device, i))
+               if (!rdma_cap_ib_mad(device, i))
                        continue;
 
                ib_umad_kill_port(&umad_dev->port[i - s]);
@@ -1333,7 +1333,7 @@ static void ib_umad_remove_one(struct ib_device *device)
                return;
 
        for (i = 0; i <= umad_dev->end_port - umad_dev->start_port; ++i) {
-               if (rdma_ib_or_iboe(device, i))
+               if (rdma_cap_ib_mad(device, i))
                        ib_umad_kill_port(&umad_dev->port[i]);
        }
 

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e6dd9846b6c26c457c21f4034c6cb7f523daff67..23ba66e25b7f75adb572e6f81c9f97e16be2fc71 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1774,6 +1774,21 @@ static inline bool rdma_ib_or_iboe(struct ib_device *device, u8 port_num)
        return (pt == RDMA_PROTOCOL_IB || pt == RDMA_PROTOCOL_IBOE);
 }
 
+/**
+ * rdma_cap_ib_mad - Check if the port of device has the capability Infiniband
+ * Management Datagrams.
+ *
+ * @device: Device to be checked
+ * @port_num: Port number of the device
+ *
+ * Return false when port of the device don't support Infiniband
+ * Management Datagrams.
+ */
+static inline bool rdma_cap_ib_mad(struct ib_device *device, u8 port_num)
+{
+       return rdma_ib_or_iboe(device, port_num);
+}
+
 int ib_query_gid(struct ib_device *device,
                 u8 port_num, int index, union ib_gid *gid);