mirror of
https://github.com/torvalds/linux
synced 2024-10-07 20:05:15 +00:00
RDMA/bnxt_re: Use rdma_read_gid_hw_context to retrieve HW gid index
bnxt_re HW maintains a GID table with only a single entry for the two duplicate GID entries (v1 and v2). Driver needs to map stack gid index to the HW table gid index. Use the new API rdma_read_gid_hw_context () to retrieve the HW GID context to get the HW table index. Link: https://lore.kernel.org/r/1582107594-5180-3-git-send-email-selvin.xavier@broadcom.com Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
parent
779820c2e1
commit
0a01623b74
|
@ -639,6 +639,7 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
|
|||
const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
|
||||
struct bnxt_re_dev *rdev = pd->rdev;
|
||||
const struct ib_gid_attr *sgid_attr;
|
||||
struct bnxt_re_gid_ctx *ctx;
|
||||
struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);
|
||||
u8 nw_type;
|
||||
int rc;
|
||||
|
@ -654,19 +655,18 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
|
|||
/* Supply the configuration for the HW */
|
||||
memcpy(ah->qplib_ah.dgid.data, grh->dgid.raw,
|
||||
sizeof(union ib_gid));
|
||||
/*
|
||||
* If RoCE V2 is enabled, stack will have two entries for
|
||||
* each GID entry. Avoiding this duplicte entry in HW. Dividing
|
||||
* the GID index by 2 for RoCE V2
|
||||
sgid_attr = grh->sgid_attr;
|
||||
/* Get the HW context of the GID. The reference
|
||||
* of GID table entry is already taken by the caller.
|
||||
*/
|
||||
ah->qplib_ah.sgid_index = grh->sgid_index / 2;
|
||||
ctx = rdma_read_gid_hw_context(sgid_attr);
|
||||
ah->qplib_ah.sgid_index = ctx->idx;
|
||||
ah->qplib_ah.host_sgid_index = grh->sgid_index;
|
||||
ah->qplib_ah.traffic_class = grh->traffic_class;
|
||||
ah->qplib_ah.flow_label = grh->flow_label;
|
||||
ah->qplib_ah.hop_limit = grh->hop_limit;
|
||||
ah->qplib_ah.sl = rdma_ah_get_sl(ah_attr);
|
||||
|
||||
sgid_attr = grh->sgid_attr;
|
||||
/* Get network header type for this GID */
|
||||
nw_type = rdma_gid_attr_network_type(sgid_attr);
|
||||
ah->qplib_ah.nw_type = bnxt_re_stack_to_dev_nw_type(nw_type);
|
||||
|
@ -1593,6 +1593,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
|
|||
const struct ib_global_route *grh =
|
||||
rdma_ah_read_grh(&qp_attr->ah_attr);
|
||||
const struct ib_gid_attr *sgid_attr;
|
||||
struct bnxt_re_gid_ctx *ctx;
|
||||
|
||||
qp->qplib_qp.modify_flags |= CMDQ_MODIFY_QP_MODIFY_MASK_DGID |
|
||||
CMDQ_MODIFY_QP_MODIFY_MASK_FLOW_LABEL |
|
||||
|
@ -1604,11 +1605,12 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
|
|||
memcpy(qp->qplib_qp.ah.dgid.data, grh->dgid.raw,
|
||||
sizeof(qp->qplib_qp.ah.dgid.data));
|
||||
qp->qplib_qp.ah.flow_label = grh->flow_label;
|
||||
/* If RoCE V2 is enabled, stack will have two entries for
|
||||
* each GID entry. Avoiding this duplicte entry in HW. Dividing
|
||||
* the GID index by 2 for RoCE V2
|
||||
sgid_attr = grh->sgid_attr;
|
||||
/* Get the HW context of the GID. The reference
|
||||
* of GID table entry is already taken by the caller.
|
||||
*/
|
||||
qp->qplib_qp.ah.sgid_index = grh->sgid_index / 2;
|
||||
ctx = rdma_read_gid_hw_context(sgid_attr);
|
||||
qp->qplib_qp.ah.sgid_index = ctx->idx;
|
||||
qp->qplib_qp.ah.host_sgid_index = grh->sgid_index;
|
||||
qp->qplib_qp.ah.hop_limit = grh->hop_limit;
|
||||
qp->qplib_qp.ah.traffic_class = grh->traffic_class;
|
||||
|
@ -1616,7 +1618,6 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
|
|||
ether_addr_copy(qp->qplib_qp.ah.dmac,
|
||||
qp_attr->ah_attr.roce.dmac);
|
||||
|
||||
sgid_attr = qp_attr->ah_attr.grh.sgid_attr;
|
||||
rc = rdma_read_gid_l2_fields(sgid_attr, NULL,
|
||||
&qp->qplib_qp.smac[0]);
|
||||
if (rc)
|
||||
|
|
Loading…
Reference in a new issue