Commit 57dba89a authored by Xi Wang's avatar Xi Wang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Clean SRQC structure definition 

Remove unused members in srq context structure.

Link: https://lore.kernel.org/r/1624262443-24528-10-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarXi Wang <wangxi11@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 2b035e73

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+3 −12
Original line number Diff line number Diff line
@@ -5450,12 +5450,8 @@ static int hns_roce_v2_modify_srq(struct ib_srq *ibsrq, 


		memset(srqc_mask, 0xff, sizeof(*srqc_mask));



		roce_set_field(srq_context->byte_8_limit_wl,

			       SRQC_BYTE_8_SRQ_LIMIT_WL_M,

			       SRQC_BYTE_8_SRQ_LIMIT_WL_S, srq_attr->srq_limit);

		roce_set_field(srqc_mask->byte_8_limit_wl,

			       SRQC_BYTE_8_SRQ_LIMIT_WL_M,

			       SRQC_BYTE_8_SRQ_LIMIT_WL_S, 0);

		hr_reg_write(srq_context, SRQC_LIMIT_WL, srq_attr->srq_limit);

		hr_reg_clear(srqc_mask, SRQC_LIMIT_WL);



		ret = hns_roce_cmd_mbox(hr_dev, mailbox->dma, 0, srq->srqn, 0,

					HNS_ROCE_CMD_MODIFY_SRQC,
@@ -5478,7 +5474,6 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) 
	struct hns_roce_srq *srq = to_hr_srq(ibsrq);

	struct hns_roce_srq_context *srq_context;

	struct hns_roce_cmd_mailbox *mailbox;

	int limit_wl;

	int ret;



	mailbox = hns_roce_alloc_cmd_mailbox(hr_dev);
@@ -5496,11 +5491,7 @@ static int hns_roce_v2_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) 
		goto out;

	}



	limit_wl = roce_get_field(srq_context->byte_8_limit_wl,

				  SRQC_BYTE_8_SRQ_LIMIT_WL_M,

				  SRQC_BYTE_8_SRQ_LIMIT_WL_S);



	attr->srq_limit = limit_wl;

	attr->srq_limit = hr_reg_read(srq_context, SRQC_LIMIT_WL);

	attr->max_wr = srq->wqe_cnt;

	attr->max_sge = srq->max_gs - srq->rsv_sge;

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+1 −81
Original line number Diff line number Diff line
@@ -379,22 +379,7 @@ struct hns_roce_v2_cq_context { 
#define CQC_POE_QID_H_1 CQC_FIELD_LOC(511, 511)



struct hns_roce_srq_context {

	__le32 byte_4_srqn_srqst;

	__le32 byte_8_limit_wl;

	__le32 byte_12_xrcd;

	__le32 byte_16_pi_ci;

	__le32 wqe_bt_ba;

	__le32 byte_24_wqe_bt_ba;

	__le32 byte_28_rqws_pd;

	__le32 idx_bt_ba;

	__le32 rsv_idx_bt_ba;

	__le32 idx_cur_blk_addr;

	__le32 byte_44_idxbufpgsz_addr;

	__le32 idx_nxt_blk_addr;

	__le32 rsv_idxnxtblkaddr;

	__le32 byte_56_xrc_cqn;

	__le32 db_record_addr_record_en;

	__le32 db_record_addr;

	__le32 data[16];

};



#define SRQC_FIELD_LOC(h, l) FIELD_LOC(struct hns_roce_srq_context, h, l)
@@ -435,71 +420,6 @@ struct hns_roce_srq_context { 
#define SRQC_DB_RECORD_ADDR_L SRQC_FIELD_LOC(479, 449)

#define SRQC_DB_RECORD_ADDR_H SRQC_FIELD_LOC(511, 480)



#define SRQC_BYTE_4_SRQ_ST_S 0

#define SRQC_BYTE_4_SRQ_ST_M GENMASK(1, 0)



#define SRQC_BYTE_4_SRQ_WQE_HOP_NUM_S 2

#define SRQC_BYTE_4_SRQ_WQE_HOP_NUM_M GENMASK(3, 2)



#define SRQC_BYTE_4_SRQ_SHIFT_S 4

#define SRQC_BYTE_4_SRQ_SHIFT_M GENMASK(7, 4)



#define SRQC_BYTE_4_SRQN_S 8

#define SRQC_BYTE_4_SRQN_M GENMASK(31, 8)



#define SRQC_BYTE_8_SRQ_LIMIT_WL_S 0

#define SRQC_BYTE_8_SRQ_LIMIT_WL_M GENMASK(15, 0)



#define SRQC_BYTE_12_SRQ_XRCD_S 0

#define SRQC_BYTE_12_SRQ_XRCD_M GENMASK(23, 0)



#define SRQC_BYTE_16_SRQ_PRODUCER_IDX_S 0

#define SRQC_BYTE_16_SRQ_PRODUCER_IDX_M GENMASK(15, 0)



#define SRQC_BYTE_16_SRQ_CONSUMER_IDX_S 0

#define SRQC_BYTE_16_SRQ_CONSUMER_IDX_M GENMASK(31, 16)



#define SRQC_BYTE_24_SRQ_WQE_BT_BA_S 0

#define SRQC_BYTE_24_SRQ_WQE_BT_BA_M GENMASK(28, 0)



#define SRQC_BYTE_28_PD_S 0

#define SRQC_BYTE_28_PD_M GENMASK(23, 0)



#define SRQC_BYTE_28_RQWS_S 24

#define SRQC_BYTE_28_RQWS_M GENMASK(27, 24)



#define SRQC_BYTE_36_SRQ_IDX_BT_BA_S 0

#define SRQC_BYTE_36_SRQ_IDX_BT_BA_M GENMASK(28, 0)



#define SRQC_BYTE_44_SRQ_IDX_CUR_BLK_ADDR_S 0

#define SRQC_BYTE_44_SRQ_IDX_CUR_BLK_ADDR_M GENMASK(19, 0)



#define SRQC_BYTE_44_SRQ_IDX_HOP_NUM_S 22

#define SRQC_BYTE_44_SRQ_IDX_HOP_NUM_M GENMASK(23, 22)



#define SRQC_BYTE_44_SRQ_IDX_BA_PG_SZ_S 24

#define SRQC_BYTE_44_SRQ_IDX_BA_PG_SZ_M GENMASK(27, 24)



#define SRQC_BYTE_44_SRQ_IDX_BUF_PG_SZ_S 28

#define SRQC_BYTE_44_SRQ_IDX_BUF_PG_SZ_M GENMASK(31, 28)



#define SRQC_BYTE_52_SRQ_IDX_NXT_BLK_ADDR_S 0

#define SRQC_BYTE_52_SRQ_IDX_NXT_BLK_ADDR_M GENMASK(19, 0)



#define SRQC_BYTE_56_SRQ_XRC_CQN_S 0

#define SRQC_BYTE_56_SRQ_XRC_CQN_M GENMASK(23, 0)



#define SRQC_BYTE_56_SRQ_WQE_BA_PG_SZ_S 24

#define SRQC_BYTE_56_SRQ_WQE_BA_PG_SZ_M GENMASK(27, 24)



#define SRQC_BYTE_56_SRQ_WQE_BUF_PG_SZ_S 28

#define SRQC_BYTE_56_SRQ_WQE_BUF_PG_SZ_M GENMASK(31, 28)



#define SRQC_BYTE_60_SRQ_RECORD_EN_S 0



#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_S 1

#define SRQC_BYTE_60_SRQ_DB_RECORD_ADDR_M GENMASK(31, 1)



enum {

	V2_MPT_ST_VALID = 0x1,

	V2_MPT_ST_FREE	= 0x2,