1 files changed, 31 insertions, 12 deletions

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
index 40f8536c10b0..ac02ce4e8040 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
@@ -38,7 +38,7 @@
 #define OCRDMA_VID_PCP_SHIFT    0xD
 
 static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
-                                struct ib_ah_attr *attr, int pdid)
+                        struct ib_ah_attr *attr, union ib_gid *sgid, int pdid)
 {
         int status = 0;
         u16 vlan_tag; bool vlan_enabled = false;
@@ -49,8 +49,7 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
         memset(&eth, 0, sizeof(eth));
         memset(&grh, 0, sizeof(grh));
 
-        ah->sgid_index = attr->grh.sgid_index;
-
+        /* VLAN */
         vlan_tag = attr->vlan_id;
         if (!vlan_tag || (vlan_tag > 0xFFF))
                 vlan_tag = dev->pvid;
@@ -65,15 +64,14 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
                 eth.eth_type = cpu_to_be16(OCRDMA_ROCE_ETH_TYPE);
                 eth_sz = sizeof(struct ocrdma_eth_basic);
         }
+        /* MAC */
         memcpy(&eth.smac[0], &dev->nic_info.mac_addr[0], ETH_ALEN);
-        memcpy(&eth.dmac[0], attr->dmac, ETH_ALEN);
         status = ocrdma_resolve_dmac(dev, attr, &eth.dmac[0]);
         if (status)
                 return status;
-        status = ocrdma_query_gid(&dev->ibdev, 1, attr->grh.sgid_index,
-                        (union ib_gid *)&grh.sgid[0]);
-        if (status)
-                return status;
+        ah->sgid_index = attr->grh.sgid_index;
+        memcpy(&grh.sgid[0], sgid->raw, sizeof(union ib_gid));
+        memcpy(&grh.dgid[0], attr->grh.dgid.raw, sizeof(attr->grh.dgid.raw));
 
         grh.tclass_flow = cpu_to_be32((6 << 28) |
                         (attr->grh.traffic_class << 24) |
@@ -81,8 +79,7 @@ static inline int set_av_attr(struct ocrdma_dev *dev, struct ocrdma_ah *ah,
         /* 0x1b is next header value in GRH */
         grh.pdid_hoplimit = cpu_to_be32((pdid << 16) |
                         (0x1b << 8) | attr->grh.hop_limit);
-
-        memcpy(&grh.dgid[0], attr->grh.dgid.raw, sizeof(attr->grh.dgid.raw));
+        /* Eth HDR */
         memcpy(&ah->av->eth_hdr, &eth, eth_sz);
         memcpy((u8 *)ah->av + eth_sz, &grh, sizeof(struct ocrdma_grh));
         if (vlan_enabled)
@@ -98,6 +95,8 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr)
         struct ocrdma_ah *ah;
         struct ocrdma_pd *pd = get_ocrdma_pd(ibpd);
         struct ocrdma_dev *dev = get_ocrdma_dev(ibpd->device);
+        union ib_gid sgid;
+        u8 zmac[ETH_ALEN];
 
         if (!(attr->ah_flags & IB_AH_GRH))
                 return ERR_PTR(-EINVAL);
@@ -111,7 +110,27 @@ struct ib_ah *ocrdma_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *attr)
         status = ocrdma_alloc_av(dev, ah);
         if (status)
                 goto av_err;
-        status = set_av_attr(dev, ah, attr, pd->id);
+
+        status = ocrdma_query_gid(&dev->ibdev, 1, attr->grh.sgid_index, &sgid);
+        if (status) {
+                pr_err("%s(): Failed to query sgid, status = %d\n",
+                      __func__, status);
+                goto av_conf_err;
+        }
+
+        memset(&zmac, 0, ETH_ALEN);
+        if (pd->uctx &&
+            memcmp(attr->dmac, &zmac, ETH_ALEN)) {
+                status = rdma_addr_find_dmac_by_grh(&sgid, &attr->grh.dgid,
+                                        attr->dmac, &attr->vlan_id);
+                if (status) {
+                        pr_err("%s(): Failed to resolve dmac from gid." 
+                                "status = %d\n", __func__, status);
+                        goto av_conf_err;
+                }
+        }
+
+        status = set_av_attr(dev, ah, attr, &sgid, pd->id);
         if (status)
                 goto av_conf_err;
 
@@ -145,7 +164,7 @@ int ocrdma_query_ah(struct ib_ah *ibah, struct ib_ah_attr *attr)
         struct ocrdma_av *av = ah->av;
         struct ocrdma_grh *grh;
         attr->ah_flags |= IB_AH_GRH;
-        if (ah->av->valid & Bit(1)) {
+        if (ah->av->valid & OCRDMA_AV_VALID) {
                 grh = (struct ocrdma_grh *)((u8 *)ah->av +
                                 sizeof(struct ocrdma_eth_vlan));
                 attr->sl = be16_to_cpu(av->eth_hdr.vlan_tag) >> 13;