diff options
| author | Don Hiatt <don.hiatt@intel.com> | 2017-11-14 04:34:16 -0800 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-11 16:01:08 -0700 |
| commit | 3cafad43e2dfb4b9cdabe3bb42bbffccf1e45538 (patch) | |
| tree | 7667276b94e6a5aee8fcc29e6610f1f567132c25 | |
| parent | ae64f9bd1d3621b5e60d7363bc20afb46aede215 (diff) | |
| download | linux-3cafad43e2dfb4b9cdabe3bb42bbffccf1e45538.tar.gz linux-3cafad43e2dfb4b9cdabe3bb42bbffccf1e45538.zip | |
IB/hfi1: Mask the path bits with the LMC for 16B RC Acks
16B packets require that the path bits are masked with the LMC.
This mask is done correctly in all 16B header creation but was
left out for the RC Acknowledge.
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Don Hiatt <don.hiatt@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
| -rw-r--r-- | drivers/infiniband/hw/hfi1/rc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c index fd01a760259f..e6fa9365de49 100644 --- a/drivers/infiniband/hw/hfi1/rc.c +++ b/drivers/infiniband/hw/hfi1/rc.c @@ -843,11 +843,11 @@ static inline void hfi1_make_rc_ack_16B(struct rvt_qp *qp, /* Convert dwords to flits */ len = (*hwords + *nwords) >> 1; - hfi1_make_16b_hdr(hdr, - ppd->lid | rdma_ah_get_path_bits(&qp->remote_ah_attr), + hfi1_make_16b_hdr(hdr, ppd->lid | + (rdma_ah_get_path_bits(&qp->remote_ah_attr) & + ((1 << ppd->lmc) - 1)), opa_get_lid(rdma_ah_get_dlid(&qp->remote_ah_attr), - 16B), - len, pkey, becn, 0, l4, sc5); + 16B), len, pkey, becn, 0, l4, sc5); bth0 = pkey | (OP(ACKNOWLEDGE) << 24); bth0 |= extra_bytes << 20; |