Commit 944e6409 authored by Lijun Ou's avatar Lijun Ou Committed by Jason Gunthorpe
Browse files

RDMA/hns: Add CM of vlan device support 



This patch mainly sets the vlan_id field in the WC for rdma_listen() to
work over vlan. This is required by ib_init_ah_attr_from_wc() which is
called by the CM REQ handler.

Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 384f8818

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+8 −1
Original line number Diff line number Diff line
@@ -2292,7 +2292,14 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq, 
		wc->smac[5] = roce_get_field(cqe->byte_28,

					     V2_CQE_BYTE_28_SMAC_5_M,

					     V2_CQE_BYTE_28_SMAC_5_S);

		if (roce_get_bit(cqe->byte_28, V2_CQE_BYTE_28_VID_VLD_S)) {

			wc->vlan_id = (u16)roce_get_field(cqe->byte_28,

							  V2_CQE_BYTE_28_VID_M,

							  V2_CQE_BYTE_28_VID_S);

		} else {

			wc->vlan_id = 0xffff;

		}



		wc->wc_flags |= (IB_WC_WITH_VLAN | IB_WC_WITH_SMAC);

		wc->network_hdr_type = roce_get_field(cqe->byte_28,

						    V2_CQE_BYTE_28_PORT_TYPE_M,

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+5 −0
Original line number Diff line number Diff line
@@ -818,6 +818,11 @@ struct hns_roce_v2_cqe { 
#define	V2_CQE_BYTE_28_PORT_TYPE_S 16

#define V2_CQE_BYTE_28_PORT_TYPE_M GENMASK(17, 16)



#define V2_CQE_BYTE_28_VID_S 18

#define V2_CQE_BYTE_28_VID_M GENMASK(29, 18)



#define V2_CQE_BYTE_28_VID_VLD_S 30



#define	V2_CQE_BYTE_32_RMT_QPN_S 0

#define V2_CQE_BYTE_32_RMT_QPN_M GENMASK(23, 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE