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

Commit af762655 authored by Lijun Ou's avatar Lijun Ou Committed by Greg Kroah-Hartman
Browse files

RDMA/hns: Bugfix for reserved qp number 



[ Upstream commit 06ef0ee4b569101f3a07ce08335dbf29fd1404ef ]

It needs to include two special qps for every port. The hip08 have four
ports and the all reserved qp numbers are eight.

Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 350703fa

drivers/infiniband/hw/hns/hns_roce_device.h

+1 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ struct hns_roce_caps { 
	u32		max_sq_inline;	/* 32 */

	u32		max_rq_sg;	/* 2 */

	int		num_qps;	/* 256k */

	int             reserved_qps;

	u32		max_wqes;	/* 16k */

	u32		max_sq_desc_sz;	/* 64 */

	u32		max_rq_desc_sz;	/* 64 */

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,7 @@ static int hns_roce_v2_profile(struct hns_roce_dev *hr_dev) 
	caps->reserved_mrws	= 1;

	caps->reserved_uars	= 0;

	caps->reserved_cqs	= 0;

	caps->reserved_qps	= HNS_ROCE_V2_RSV_QPS;



	caps->qpc_ba_pg_sz	= 0;

	caps->qpc_buf_pg_sz	= 0;

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
#define HNS_ROCE_INVALID_LKEY			0x100

#define HNS_ROCE_CMQ_TX_TIMEOUT			30000

#define HNS_ROCE_V2_UC_RC_SGE_NUM_IN_WQE	2

#define HNS_ROCE_V2_RSV_QPS			8



#define HNS_ROCE_CONTEXT_HOP_NUM		1

#define HNS_ROCE_MTT_HOP_NUM			1

drivers/infiniband/hw/hns/hns_roce_qp.c

+8 −2
Original line number Diff line number Diff line
@@ -1106,14 +1106,20 @@ int hns_roce_init_qp_table(struct hns_roce_dev *hr_dev) 
{

	struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;

	int reserved_from_top = 0;

	int reserved_from_bot;

	int ret;



	spin_lock_init(&qp_table->lock);

	INIT_RADIX_TREE(&hr_dev->qp_table_tree, GFP_ATOMIC);



	/* A port include two SQP, six port total 12 */

	/* In hw v1, a port include two SQP, six ports total 12 */

	if (hr_dev->caps.max_sq_sg <= 2)

		reserved_from_bot = SQP_NUM;

	else

		reserved_from_bot = hr_dev->caps.reserved_qps;



	ret = hns_roce_bitmap_init(&qp_table->bitmap, hr_dev->caps.num_qps,

				   hr_dev->caps.num_qps - 1, SQP_NUM,

				   hr_dev->caps.num_qps - 1, reserved_from_bot,

				   reserved_from_top);

	if (ret) {

		dev_err(hr_dev->dev, "qp bitmap init failed!error=%d\n",