Commit fef60902 authored by Michael Wang's avatar Michael Wang Committed by Doug Ledford

IB/Verbs: Reform rest part in IB-core cma

Use raw management helpers to reform rest part in IB-core cma.
Signed-off-by: default avatarMichael Wang <yun.wang@profitbricks.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tested-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 7c11147d
...@@ -447,10 +447,10 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv) ...@@ -447,10 +447,10 @@ static int cma_resolve_ib_dev(struct rdma_id_private *id_priv)
pkey = ntohs(addr->sib_pkey); pkey = ntohs(addr->sib_pkey);
list_for_each_entry(cur_dev, &dev_list, list) { list_for_each_entry(cur_dev, &dev_list, list) {
if (rdma_node_get_transport(cur_dev->device->node_type) != RDMA_TRANSPORT_IB) for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {
if (!rdma_ib_or_iboe(cur_dev->device, p))
continue; continue;
for (p = 1; p <= cur_dev->device->phys_port_cnt; ++p) {
if (ib_find_cached_pkey(cur_dev->device, p, pkey, &index)) if (ib_find_cached_pkey(cur_dev->device, p, pkey, &index))
continue; continue;
...@@ -645,10 +645,9 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv, ...@@ -645,10 +645,9 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
if (ret) if (ret)
goto out; goto out;
if (rdma_node_get_transport(id_priv->cma_dev->device->node_type) BUG_ON(id_priv->cma_dev->device != id_priv->id.device);
== RDMA_TRANSPORT_IB &&
rdma_port_get_link_layer(id_priv->id.device, id_priv->id.port_num) if (rdma_protocol_iboe(id_priv->id.device, id_priv->id.port_num)) {
== IB_LINK_LAYER_ETHERNET) {
ret = rdma_addr_find_smac_by_sgid(&sgid, qp_attr.smac, NULL); ret = rdma_addr_find_smac_by_sgid(&sgid, qp_attr.smac, NULL);
if (ret) if (ret)
...@@ -712,11 +711,10 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv, ...@@ -712,11 +711,10 @@ static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
int ret; int ret;
u16 pkey; u16 pkey;
if (rdma_port_get_link_layer(id_priv->id.device, id_priv->id.port_num) == if (rdma_protocol_iboe(id_priv->id.device, id_priv->id.port_num))
IB_LINK_LAYER_INFINIBAND)
pkey = ib_addr_get_pkey(dev_addr);
else
pkey = 0xffff; pkey = 0xffff;
else
pkey = ib_addr_get_pkey(dev_addr);
ret = ib_find_cached_pkey(id_priv->id.device, id_priv->id.port_num, ret = ib_find_cached_pkey(id_priv->id.device, id_priv->id.port_num,
pkey, &qp_attr->pkey_index); pkey, &qp_attr->pkey_index);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment