Commit 773f841a authored by Weihang Li's avatar Weihang Li Committed by Jason Gunthorpe
Browse files

RDMA/hns: Avoid filling sgid index when modifying QP to RTR 

ULP usually set IB(V)_QP_AV when trying to modify QP to RTR if they want
to record sgid index into QPC. For UD QPs, it is useless because it will
be included in WQE. For RC QPs, it will be filled in
hns_roce_set_path(). So sgid index shouldn't be filled by default. Then
hns_get_gid_index() is moved to hns_roce_hw_v1.c because it is only called
in it.

Fixes: 926a01dc ("RDMA/hns: Add QP operations support for hip08 SoC")
Link: https://lore.kernel.org/r/1612517974-31867-2-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 01584a5e

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+16 −0
Original line number Diff line number Diff line
@@ -43,6 +43,22 @@ 
#include "hns_roce_hem.h"

#include "hns_roce_hw_v1.h"



/**

 * hns_get_gid_index - Get gid index.

 * @hr_dev: pointer to structure hns_roce_dev.

 * @port:  port, value range: 0 ~ MAX

 * @gid_index:  gid_index, value range: 0 ~ MAX

 * Description:

 *    N ports shared gids, allocation method as follow:

 *		GID[0][0], GID[1][0],.....GID[N - 1][0],

 *		GID[0][0], GID[1][0],.....GID[N - 1][0],

 *		And so on

 */

u8 hns_get_gid_index(struct hns_roce_dev *hr_dev, u8 port, int gid_index)

{

	return gid_index * hr_dev->caps.num_ports + port;

}



static void set_data_seg(struct hns_roce_wqe_data_seg *dseg, struct ib_sge *sg)

{

	dseg->lkey = cpu_to_le32(sg->lkey);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −11
Original line number Diff line number Diff line
@@ -4308,7 +4308,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
				 struct hns_roce_v2_qp_context *context,

				 struct hns_roce_v2_qp_context *qpc_mask)

{

	const struct ib_global_route *grh = rdma_ah_read_grh(&attr->ah_attr);

	struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);

	struct hns_roce_qp *hr_qp = to_hr_qp(ibqp);

	struct ib_device *ibdev = &hr_dev->ib_dev;
@@ -4316,7 +4315,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
	dma_addr_t irrl_ba;

	enum ib_mtu mtu;

	u8 lp_pktn_ini;

	u8 port_num;

	u64 *mtts;

	u8 *dmac;

	u8 *smac;
@@ -4397,15 +4395,6 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp, 
			       V2_QPC_BYTE_56_DQPN_M, V2_QPC_BYTE_56_DQPN_S, 0);

	}



	/* Configure GID index */

	port_num = rdma_ah_get_port_num(&attr->ah_attr);

	roce_set_field(context->byte_20_smac_sgid_idx,

		       V2_QPC_BYTE_20_SGID_IDX_M, V2_QPC_BYTE_20_SGID_IDX_S,

		       hns_get_gid_index(hr_dev, port_num - 1,

					 grh->sgid_index));

	roce_set_field(qpc_mask->byte_20_smac_sgid_idx,

		       V2_QPC_BYTE_20_SGID_IDX_M, V2_QPC_BYTE_20_SGID_IDX_S, 0);



	memcpy(&(context->dmac), dmac, sizeof(u32));

	roce_set_field(context->byte_52_udpspn_dmac, V2_QPC_BYTE_52_DMAC_M,

		       V2_QPC_BYTE_52_DMAC_S, *((u16 *)(&dmac[4])));

drivers/infiniband/hw/hns/hns_roce_main.c

+0 −16
Original line number Diff line number Diff line
@@ -42,22 +42,6 @@ 
#include "hns_roce_device.h"

#include "hns_roce_hem.h"



/**

 * hns_get_gid_index - Get gid index.

 * @hr_dev: pointer to structure hns_roce_dev.

 * @port:  port, value range: 0 ~ MAX

 * @gid_index:  gid_index, value range: 0 ~ MAX

 * Description:

 *    N ports shared gids, allocation method as follow:

 *		GID[0][0], GID[1][0],.....GID[N - 1][0],

 *		GID[0][0], GID[1][0],.....GID[N - 1][0],

 *		And so on

 */

u8 hns_get_gid_index(struct hns_roce_dev *hr_dev, u8 port, int gid_index)

{

	return gid_index * hr_dev->caps.num_ports + port;

}



static int hns_roce_set_mac(struct hns_roce_dev *hr_dev, u8 port, u8 *addr)

{

	u8 phy_port;