IB/core: Use rdma_ah_attr accessor functions

[karo-tx-linux.git] / drivers / infiniband / hw / hns / hns_roce_ah.c

diff --git a/drivers/infiniband/hw/hns/hns_roce_ah.c b/drivers/infiniband/hw/hns/hns_roce_ah.c
index 214c9b4195f40a0dafc6e64fc6eb7c6e949e47eb..f78a733a63ec7e1f884930a72e53ba2100ee888e 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_ah.c
+++ b/drivers/infiniband/hw/hns/hns_roce_ah.c
@@ -49,6 +49,7 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
        struct hns_roce_ah *ah;
        u16 vlan_tag = 0xffff;
        struct in6_addr in6;
+       const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
        union ib_gid sgid;
        int ret;
 
@@ -57,15 +58,20 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
                return ERR_PTR(-ENOMEM);
 
        /* Get mac address */
-       memcpy(&in6, ah_attr->grh.dgid.raw, sizeof(ah_attr->grh.dgid.raw));
-       if (rdma_is_multicast_addr(&in6))
+       memcpy(&in6, grh->dgid.raw, sizeof(grh->dgid.raw));
+       if (rdma_is_multicast_addr(&in6)) {
                rdma_get_mcast_mac(&in6, ah->av.mac);
-       else
-               memcpy(ah->av.mac, ah_attr->dmac, sizeof(ah_attr->dmac));
+       } else {
+               u8 *dmac = rdma_ah_retrieve_dmac(ah_attr);
+
+               if (!dmac)
+                       return ERR_PTR(-EINVAL);
+               memcpy(ah->av.mac, dmac, ETH_ALEN);
+       }
 
        /* Get source gid */
-       ret = ib_get_cached_gid(ibpd->device, ah_attr->port_num,
-                               ah_attr->grh.sgid_index, &sgid, &gid_attr);
+       ret = ib_get_cached_gid(ibpd->device, rdma_ah_get_port_num(ah_attr),
+                               grh->sgid_index, &sgid, &gid_attr);
        if (ret) {
                dev_err(dev, "get sgid failed! ret = %d\n", ret);
                kfree(ah);
@@ -79,21 +85,23 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
        }
 
        if (vlan_tag < 0x1000)
-               vlan_tag |= (ah_attr->sl & HNS_ROCE_VLAN_SL_BIT_MASK) <<
+               vlan_tag |= (rdma_ah_get_sl(ah_attr) &
+                            HNS_ROCE_VLAN_SL_BIT_MASK) <<
                             HNS_ROCE_VLAN_SL_SHIFT;
 
-       ah->av.port_pd = cpu_to_be32(to_hr_pd(ibpd)->pdn | (ah_attr->port_num <<
+       ah->av.port_pd = cpu_to_be32(to_hr_pd(ibpd)->pdn |
+                                    (rdma_ah_get_port_num(ah_attr) <<
                                     HNS_ROCE_PORT_NUM_SHIFT));
-       ah->av.gid_index = ah_attr->grh.sgid_index;
+       ah->av.gid_index = grh->sgid_index;
        ah->av.vlan = cpu_to_le16(vlan_tag);
        dev_dbg(dev, "gid_index = 0x%x,vlan = 0x%x\n", ah->av.gid_index,
                ah->av.vlan);
 
-       if (ah_attr->static_rate)
+       if (rdma_ah_get_static_rate(ah_attr))
                ah->av.stat_rate = IB_RATE_10_GBPS;
 
-       memcpy(ah->av.dgid, ah_attr->grh.dgid.raw, HNS_ROCE_GID_SIZE);
-       ah->av.sl_tclass_flowlabel = cpu_to_le32(ah_attr->sl <<
+       memcpy(ah->av.dgid, grh->dgid.raw, HNS_ROCE_GID_SIZE);
+       ah->av.sl_tclass_flowlabel = cpu_to_le32(rdma_ah_get_sl(ah_attr) <<
                                                 HNS_ROCE_SL_SHIFT);
 
        return &ah->ibah;
@@ -105,19 +113,18 @@ int hns_roce_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
 
        memset(ah_attr, 0, sizeof(*ah_attr));
 
-       ah_attr->sl = le32_to_cpu(ah->av.sl_tclass_flowlabel) >>
-                                 HNS_ROCE_SL_SHIFT;
-       ah_attr->port_num = le32_to_cpu(ah->av.port_pd) >>
-                                       HNS_ROCE_PORT_NUM_SHIFT;
-       ah_attr->static_rate = ah->av.stat_rate;
-       ah_attr->ah_flags = IB_AH_GRH;
-       ah_attr->grh.traffic_class = le32_to_cpu(ah->av.sl_tclass_flowlabel) >>
-                                                HNS_ROCE_TCLASS_SHIFT;
-       ah_attr->grh.flow_label = le32_to_cpu(ah->av.sl_tclass_flowlabel) &
-                                             HNS_ROCE_FLOW_LABLE_MASK;
-       ah_attr->grh.hop_limit = ah->av.hop_limit;
-       ah_attr->grh.sgid_index = ah->av.gid_index;
-       memcpy(ah_attr->grh.dgid.raw, ah->av.dgid, HNS_ROCE_GID_SIZE);
+       rdma_ah_set_sl(ah_attr, (le32_to_cpu(ah->av.sl_tclass_flowlabel) >>
+                                HNS_ROCE_SL_SHIFT));
+       rdma_ah_set_port_num(ah_attr, (le32_to_cpu(ah->av.port_pd) >>
+                                      HNS_ROCE_PORT_NUM_SHIFT));
+       rdma_ah_set_static_rate(ah_attr, ah->av.stat_rate);
+       rdma_ah_set_grh(ah_attr, NULL,
+                       (le32_to_cpu(ah->av.sl_tclass_flowlabel) &
+                        HNS_ROCE_FLOW_LABLE_MASK), ah->av.gid_index,
+                       ah->av.hop_limit,
+                       (le32_to_cpu(ah->av.sl_tclass_flowlabel) >>
+                        HNS_ROCE_TCLASS_SHIFT));
+       rdma_ah_set_dgid_raw(ah_attr, ah->av.dgid);
 
        return 0;
 }