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

Commit b16f8188 authored by Yixian Liu's avatar Yixian Liu Committed by Jason Gunthorpe
Browse files

RDMA/hns: Refactor eq code for hip06 



Considering the compatibility of supporting hip08's eq
process and possible changes of data structure, this patch
refactors the eq code structure of hip06.

We move all the eq process code for hip06 from hns_roce_eq.c
into hns_roce_hw_v1.c, and also for hns_roce_eq.h. With
these changes, it will be convenient to add the eq support
for later hardware version.

Signed-off-by: default avatarYixian Liu <liuyixian@huawei.com>
Reviewed-by: default avatarLijun Ou <oulijun@huawei.com>
Reviewed-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 74482086

drivers/infiniband/hw/hns/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,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_eq.o hns_roce_pd.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

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

drivers/infiniband/hw/hns/hns_roce_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, 
	context->out_param = out_param;

	complete(&context->done);

}

EXPORT_SYMBOL_GPL(hns_roce_cmd_event);



/* this should be called with "use_events" */

static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param,

drivers/infiniband/hw/hns/hns_roce_cq.c

+10 −9
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ void hns_roce_free_cq(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
	if (ret)

		dev_err(dev, "HW2SW_CQ failed (%d) for CQN %06lx\n", ret,

			hr_cq->cqn);

	if (hr_dev->eq_table.eq) {



	/* Waiting interrupt process procedure carried out */

	synchronize_irq(hr_dev->eq_table.eq[hr_cq->vector].irq);
@@ -204,7 +204,6 @@ void hns_roce_free_cq(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
	if (atomic_dec_and_test(&hr_cq->refcount))

		complete(&hr_cq->free);

	wait_for_completion(&hr_cq->free);

	}



	spin_lock_irq(&cq_table->lock);

	radix_tree_delete(&cq_table->tree, hr_cq->cqn);
@@ -460,6 +459,7 @@ void hns_roce_cq_completion(struct hns_roce_dev *hr_dev, u32 cqn) 
	++cq->arm_sn;

	cq->comp(cq);

}

EXPORT_SYMBOL_GPL(hns_roce_cq_completion);



void hns_roce_cq_event(struct hns_roce_dev *hr_dev, u32 cqn, int event_type)

{
@@ -482,6 +482,7 @@ void hns_roce_cq_event(struct hns_roce_dev *hr_dev, u32 cqn, int event_type) 
	if (atomic_dec_and_test(&cq->refcount))

		complete(&cq->free);

}

EXPORT_SYMBOL_GPL(hns_roce_cq_event);



int hns_roce_init_cq_table(struct hns_roce_dev *hr_dev)

{

drivers/infiniband/hw/hns/hns_roce_device.h

+51 −6
Original line number Diff line number Diff line
@@ -62,12 +62,16 @@ 
#define HNS_ROCE_CQE_WCMD_EMPTY_BIT		0x2

#define HNS_ROCE_MIN_CQE_CNT			16



#define HNS_ROCE_MAX_IRQ_NUM			34

#define HNS_ROCE_MAX_IRQ_NUM			128



#define HNS_ROCE_COMP_VEC_NUM			32

#define EQ_ENABLE				1

#define EQ_DISABLE				0



#define HNS_ROCE_AEQE_VEC_NUM			1

#define HNS_ROCE_AEQE_OF_VEC_NUM		1

#define HNS_ROCE_CEQ				0

#define HNS_ROCE_AEQ				1



#define HNS_ROCE_CEQ_ENTRY_SIZE			0x4

#define HNS_ROCE_AEQ_ENTRY_SIZE			0x10



/* 4G/4K = 1M */

#define HNS_ROCE_SL_SHIFT			28
@@ -485,6 +489,45 @@ struct hns_roce_ib_iboe { 
	u8			phy_port[HNS_ROCE_MAX_PORTS];

};



enum {

	HNS_ROCE_EQ_STAT_INVALID  = 0,

	HNS_ROCE_EQ_STAT_VALID    = 2,

};



struct hns_roce_ceqe {

	u32			comp;

};



struct hns_roce_aeqe {

	u32 asyn;

	union {

		struct {

			u32 qp;

			u32 rsv0;

			u32 rsv1;

		} qp_event;



		struct {

			u32 cq;

			u32 rsv0;

			u32 rsv1;

		} cq_event;



		struct {

			u32 ceqe;

			u32 rsv0;

			u32 rsv1;

		} ce_event;



		struct {

			__le64  out_param;

			__le16  token;

			u8	status;

			u8	rsv0;

		} __packed cmd;

	 } event;

};



struct hns_roce_eq {

	struct hns_roce_dev		*hr_dev;

	void __iomem			*doorbell;
@@ -502,7 +545,7 @@ struct hns_roce_eq { 


struct hns_roce_eq_table {

	struct hns_roce_eq	*eq;

	void __iomem		**eqc_base;

	void __iomem		**eqc_base; /* only for hw v1 */

};



struct hns_roce_caps {
@@ -550,7 +593,7 @@ struct hns_roce_caps { 
	u32		pbl_buf_pg_sz;

	u32		pbl_hop_num;

	int		aeqe_depth;

	int		ceqe_depth[HNS_ROCE_COMP_VEC_NUM];

	int		ceqe_depth;

	enum ib_mtu	max_mtu;

	u32		qpc_bt_num;

	u32		srqc_bt_num;
@@ -623,6 +666,8 @@ struct hns_roce_hw { 
	int (*dereg_mr)(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr);

	int (*destroy_cq)(struct ib_cq *ibcq);

	int (*modify_cq)(struct ib_cq *cq, u16 cq_count, u16 cq_period);

	int (*init_eq)(struct hns_roce_dev *hr_dev);

	void (*cleanup_eq)(struct hns_roce_dev *hr_dev);

};



struct hns_roce_dev {

drivers/infiniband/hw/hns/hns_roce_eq.c

deleted100644 → 0
+0 −759

File deleted.

Preview size limit exceeded, changes collapsed.