Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6

[mirror_ubuntu-focal-kernel.git] / drivers / infiniband / core / sa_query.c

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index c38f030f0dc994d7e3edd6b4bd5af893c03d8214..0fae85062a65b8704ddc11a117751df62db9c9d4 100644 (file)
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -450,7 +450,7 @@ static void ib_sa_event(struct ib_event_handler *handler, struct ib_event *event
                struct ib_sa_port *port =
                        &sa_dev->port[event->element.port_num - sa_dev->start_port];
 
-               if (rdma_port_get_link_layer(handler->device, port->port_num) != IB_LINK_LAYER_INFINIBAND)
+               if (!rdma_cap_ib_sa(handler->device, port->port_num))
                        return;
 
                spin_lock_irqsave(&port->ah_lock, flags);
@@ -540,7 +540,7 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
        ah_attr->port_num = port_num;
        ah_attr->static_rate = rec->rate;
 
-       force_grh = rdma_port_get_link_layer(device, port_num) == IB_LINK_LAYER_ETHERNET;
+       force_grh = rdma_cap_eth_ah(device, port_num);
 
        if (rec->hop_limit > 1 || force_grh) {
                ah_attr->ah_flags = IB_AH_GRH;
@@ -583,7 +583,8 @@ static int alloc_mad(struct ib_sa_query *query, gfp_t gfp_mask)
        query->mad_buf = ib_create_send_mad(query->port->agent, 1,
                                            query->sm_ah->pkey_index,
                                            0, IB_MGMT_SA_HDR, IB_MGMT_SA_DATA,
-                                           gfp_mask);
+                                           gfp_mask,
+                                           IB_MGMT_BASE_VERSION);
        if (IS_ERR(query->mad_buf)) {
                kref_put(&query->sm_ah->ref, free_sm_ah);
                return -ENOMEM;
@@ -1153,9 +1154,7 @@ static void ib_sa_add_one(struct ib_device *device)
 {
        struct ib_sa_device *sa_dev;
        int s, e, i;
-
-       if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
-               return;
+       int count = 0;
 
        if (device->node_type == RDMA_NODE_IB_SWITCH)
                s = e = 0;
@@ -1175,7 +1174,7 @@ static void ib_sa_add_one(struct ib_device *device)
 
        for (i = 0; i <= e - s; ++i) {
                spin_lock_init(&sa_dev->port[i].ah_lock);
-               if (rdma_port_get_link_layer(device, i + 1) != IB_LINK_LAYER_INFINIBAND)
+               if (!rdma_cap_ib_sa(device, i + 1))
                        continue;
 
                sa_dev->port[i].sm_ah    = NULL;
@@ -1189,8 +1188,13 @@ static void ib_sa_add_one(struct ib_device *device)
                        goto err;
 
                INIT_WORK(&sa_dev->port[i].update_task, update_sm_ah);
+
+               count++;
        }
 
+       if (!count)
+               goto free;
+
        ib_set_client_data(device, &sa_client, sa_dev);
 
        /*
@@ -1204,19 +1208,20 @@ static void ib_sa_add_one(struct ib_device *device)
        if (ib_register_event_handler(&sa_dev->event_handler))
                goto err;
 
-       for (i = 0; i <= e - s; ++i)
-               if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND)
+       for (i = 0; i <= e - s; ++i) {
+               if (rdma_cap_ib_sa(device, i + 1))
                        update_sm_ah(&sa_dev->port[i].update_task);
+       }
 
        return;
 
 err:
-       while (--i >= 0)
-               if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND)
+       while (--i >= 0) {
+               if (rdma_cap_ib_sa(device, i + 1))
                        ib_unregister_mad_agent(sa_dev->port[i].agent);
-
+       }
+free:
        kfree(sa_dev);
-
        return;
 }
 
@@ -1233,7 +1238,7 @@ static void ib_sa_remove_one(struct ib_device *device)
        flush_workqueue(ib_wq);
 
        for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {
-               if (rdma_port_get_link_layer(device, i + 1) == IB_LINK_LAYER_INFINIBAND) {
+               if (rdma_cap_ib_sa(device, i + 1)) {
                        ib_unregister_mad_agent(sa_dev->port[i].agent);
                        if (sa_dev->port[i].sm_ah)
                                kref_put(&sa_dev->port[i].sm_ah->ref, free_sm_ah);