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

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

RDMA/hns: Init SRQ table for hip08 



This patch inits hem resource for SRQ table, includes
SRQWQE and SRQWQE index resource.

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

drivers/infiniband/hw/hns/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 
obj-$(CONFIG_INFINIBAND_HNS) += hns-roce.o

hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \

	hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o

obj-$(CONFIG_INFINIBAND_HNS_HIP06) += hns-roce-hw-v1.o

hns-roce-hw-v1-objs := hns_roce_hw_v1.o

obj-$(CONFIG_INFINIBAND_HNS_HIP08) += hns-roce-hw-v2.o

drivers/infiniband/hw/hns/hns_roce_alloc.c

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ int hns_roce_buf_alloc(struct hns_roce_dev *hr_dev, u32 size, u32 max_direct, 


void hns_roce_cleanup_bitmap(struct hns_roce_dev *hr_dev)

{

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ)

		hns_roce_cleanup_srq_table(hr_dev);

	hns_roce_cleanup_qp_table(hr_dev);

	hns_roce_cleanup_cq_table(hr_dev);

	hns_roce_cleanup_mr_table(hr_dev);

drivers/infiniband/hw/hns/hns_roce_device.h

+23 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ enum { 
enum hns_roce_mtt_type {

	MTT_TYPE_WQE,

	MTT_TYPE_CQE,

	MTT_TYPE_SRQWQE,

	MTT_TYPE_IDX

};



enum {
@@ -340,6 +342,10 @@ struct hns_roce_mr_table { 
	struct hns_roce_hem_table	mtpt_table;

	struct hns_roce_buddy		mtt_cqe_buddy;

	struct hns_roce_hem_table	mtt_cqe_table;

	struct hns_roce_buddy		mtt_srqwqe_buddy;

	struct hns_roce_hem_table	mtt_srqwqe_table;

	struct hns_roce_buddy		mtt_idx_buddy;

	struct hns_roce_hem_table	mtt_idx_table;

};



struct hns_roce_wq {
@@ -454,6 +460,12 @@ struct hns_roce_cq_table { 
	struct hns_roce_hem_table	table;

};



struct hns_roce_srq_table {

	struct hns_roce_bitmap		bitmap;

	struct xarray			xa;

	struct hns_roce_hem_table	table;

};



struct hns_roce_raq_table {

	struct hns_roce_buf_list	*e_raq_buf;

};
@@ -680,6 +692,8 @@ struct hns_roce_caps { 
	u32		max_extend_sg;

	int		num_qps;	/* 256k */

	int             reserved_qps;

	u32		max_srq_sg;

	int		num_srqs;

	u32		max_wqes;	/* 16k */

	u32		max_srqs;

	u32		max_srq_wrs;
@@ -694,12 +708,16 @@ struct hns_roce_caps { 
	int		min_cqes;

	u32		min_wqes;

	int		reserved_cqs;

	int		reserved_srqs;

	u32		max_srqwqes;

	int		num_aeq_vectors;	/* 1 */

	int		num_comp_vectors;

	int		num_other_vectors;

	int		num_mtpts;

	u32		num_mtt_segs;

	u32		num_cqe_segs;

	u32		num_srqwqe_segs;

	u32		num_idx_segs;

	int		reserved_mrws;

	int		reserved_uars;

	int		num_pds;
@@ -713,6 +731,8 @@ struct hns_roce_caps { 
	int		irrl_entry_sz;

	int		trrl_entry_sz;

	int		cqc_entry_sz;

	int		srqc_entry_sz;

	int		idx_entry_sz;

	u32		pbl_ba_pg_sz;

	u32		pbl_buf_pg_sz;

	u32		pbl_hop_num;
@@ -843,6 +863,7 @@ struct hns_roce_dev { 
	struct hns_roce_uar_table uar_table;

	struct hns_roce_mr_table  mr_table;

	struct hns_roce_cq_table  cq_table;

	struct hns_roce_srq_table srq_table;

	struct hns_roce_qp_table  qp_table;

	struct hns_roce_eq_table  eq_table;
@@ -955,12 +976,14 @@ int hns_roce_init_mr_table(struct hns_roce_dev *hr_dev); 
int hns_roce_init_eq_table(struct hns_roce_dev *hr_dev);

int hns_roce_init_cq_table(struct hns_roce_dev *hr_dev);

int hns_roce_init_qp_table(struct hns_roce_dev *hr_dev);

int hns_roce_init_srq_table(struct hns_roce_dev *hr_dev);



void hns_roce_cleanup_pd_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_mr_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_eq_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_cq_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev);

void hns_roce_cleanup_srq_table(struct hns_roce_dev *hr_dev);



int hns_roce_bitmap_alloc(struct hns_roce_bitmap *bitmap, unsigned long *obj);

void hns_roce_bitmap_free(struct hns_roce_bitmap *bitmap, unsigned long obj,

drivers/infiniband/hw/hns/hns_roce_hem.c

+9 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,15 @@ void hns_roce_cleanup_hem_table(struct hns_roce_dev *hr_dev, 


void hns_roce_cleanup_hem(struct hns_roce_dev *hr_dev)

{

	if ((hr_dev->caps.num_idx_segs))

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->mr_table.mtt_idx_table);

	if (hr_dev->caps.num_srqwqe_segs)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->mr_table.mtt_srqwqe_table);

	if (hr_dev->caps.srqc_entry_sz)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->srq_table.table);

	hns_roce_cleanup_hem_table(hr_dev, &hr_dev->cq_table.table);

	if (hr_dev->caps.trrl_entry_sz)

		hns_roce_cleanup_hem_table(hr_dev,

drivers/infiniband/hw/hns/hns_roce_hem.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ enum { 
	 /* UNMAP HEM */

	HEM_TYPE_MTT,

	HEM_TYPE_CQE,

	HEM_TYPE_SRQWQE,

	HEM_TYPE_IDX,

	HEM_TYPE_IRRL,

	HEM_TYPE_TRRL,

};