Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

RDMA/hns: Assign the value for vlan field of qp context 



This patch mainly fills the correct value into the vlan id field of qp
context as well as update the vlan field name according to the latest
hardware user manual.

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

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+11 −4
Original line number Diff line number Diff line
@@ -2527,10 +2527,10 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp, 
		       V2_QPC_BYTE_20_RQ_SHIFT_M, V2_QPC_BYTE_20_RQ_SHIFT_S, 0);



	/* No VLAN need to set 0xFFF */

	roce_set_field(context->byte_24_mtu_tc, V2_QPC_BYTE_24_VLAN_IDX_M,

		       V2_QPC_BYTE_24_VLAN_IDX_S, 0xfff);

	roce_set_field(qpc_mask->byte_24_mtu_tc, V2_QPC_BYTE_24_VLAN_IDX_M,

		       V2_QPC_BYTE_24_VLAN_IDX_S, 0);

	roce_set_field(context->byte_24_mtu_tc, V2_QPC_BYTE_24_VLAN_ID_M,

		       V2_QPC_BYTE_24_VLAN_ID_S, 0xfff);

	roce_set_field(qpc_mask->byte_24_mtu_tc, V2_QPC_BYTE_24_VLAN_ID_M,

		       V2_QPC_BYTE_24_VLAN_ID_S, 0);



	/*

	 * Set some fields in context to zero, Because the default values
@@ -3472,6 +3472,13 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp, 
			memcpy(src_mac, gid_attr->ndev->dev_addr, ETH_ALEN);

		}



		roce_set_field(context->byte_24_mtu_tc,

			       V2_QPC_BYTE_24_VLAN_ID_M,

			       V2_QPC_BYTE_24_VLAN_ID_S, vlan);

		roce_set_field(qpc_mask->byte_24_mtu_tc,

			       V2_QPC_BYTE_24_VLAN_ID_M,

			       V2_QPC_BYTE_24_VLAN_ID_S, 0);



		if (grh->sgid_index >= hr_dev->caps.gid_table_len[hr_port]) {

			dev_err(hr_dev->dev,

				"sgid_index(%u) too large. max is %d\n",

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+2 −2
Original line number Diff line number Diff line
@@ -451,8 +451,8 @@ struct hns_roce_v2_qp_context { 
#define	V2_QPC_BYTE_24_TC_S 8

#define V2_QPC_BYTE_24_TC_M GENMASK(15, 8)



#define	V2_QPC_BYTE_24_VLAN_IDX_S 16

#define V2_QPC_BYTE_24_VLAN_IDX_M GENMASK(27, 16)

#define	V2_QPC_BYTE_24_VLAN_ID_S 16

#define V2_QPC_BYTE_24_VLAN_ID_M GENMASK(27, 16)



#define	V2_QPC_BYTE_24_MTU_S 28

#define V2_QPC_BYTE_24_MTU_M GENMASK(31, 28)