Commit cf7f8f5c authored by Chengchang Tang's avatar Chengchang Tang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Remove similar code that configures the hardware contexts 

Remove duplicate code for creating and destroying hardware contexts via
mailbox.

Link: https://lore.kernel.org/r/20220302064830.61706-7-liangwenpeng@huawei.com


Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 162e29fe

drivers/infiniband/hw/hns/hns_roce_cmd.c

+12 −0
Original line number Diff line number Diff line
@@ -262,3 +262,15 @@ void hns_roce_free_cmd_mailbox(struct hns_roce_dev *hr_dev, 
	dma_pool_free(hr_dev->cmd.pool, mailbox->buf, mailbox->dma);

	kfree(mailbox);

}



int hns_roce_create_hw_ctx(struct hns_roce_dev *dev,

			   struct hns_roce_cmd_mailbox *mailbox,

			   u8 cmd, unsigned long idx)

{

	return hns_roce_cmd_mbox(dev, mailbox->dma, 0, cmd, idx);

}



int hns_roce_destroy_hw_ctx(struct hns_roce_dev *dev, u8 cmd, unsigned long idx)

{

	return hns_roce_cmd_mbox(dev, 0, 0, cmd, idx);

}

drivers/infiniband/hw/hns/hns_roce_cmd.h

+5 −0
Original line number Diff line number Diff line
@@ -146,5 +146,10 @@ struct hns_roce_cmd_mailbox * 
hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev);

void hns_roce_free_cmd_mailbox(struct hns_roce_dev *hr_dev,

			       struct hns_roce_cmd_mailbox *mailbox);

int hns_roce_create_hw_ctx(struct hns_roce_dev *dev,

			   struct hns_roce_cmd_mailbox *mailbox,

			   u8 cmd, unsigned long idx);

int hns_roce_destroy_hw_ctx(struct hns_roce_dev *dev, u8 cmd,

			    unsigned long idx);



#endif /* _HNS_ROCE_CMD_H */

drivers/infiniband/hw/hns/hns_roce_cq.c

+4 −4
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 


	hr_dev->hw->write_cqc(hr_dev, hr_cq, mailbox->buf, mtts, dma_handle);



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

				HNS_ROCE_CMD_CREATE_CQC, hr_cq->cqn);

	ret = hns_roce_create_hw_ctx(hr_dev, mailbox, HNS_ROCE_CMD_CREATE_CQC,

				     hr_cq->cqn);

	hns_roce_free_cmd_mailbox(hr_dev, mailbox);

	if (ret) {

		ibdev_err(ibdev,
@@ -173,7 +173,7 @@ static void free_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
	struct device *dev = hr_dev->dev;

	int ret;



	ret = hns_roce_cmd_mbox(hr_dev, 0, 0, HNS_ROCE_CMD_DESTROY_CQC,

	ret = hns_roce_destroy_hw_ctx(hr_dev, HNS_ROCE_CMD_DESTROY_CQC,

				      hr_cq->cqn);

	if (ret)

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

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −2
Original line number Diff line number Diff line
@@ -1152,8 +1152,6 @@ struct ib_mr *hns_roce_alloc_mr(struct ib_pd *pd, enum ib_mr_type mr_type, 
int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,

		       unsigned int *sg_offset);

int hns_roce_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata);

int hns_roce_hw_destroy_mpt(struct hns_roce_dev *hr_dev,

			    unsigned long mpt_index);

unsigned long key_to_hw_index(u32 key);



int hns_roce_alloc_mw(struct ib_mw *mw, struct ib_udata *udata);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+2 −2
Original line number Diff line number Diff line
@@ -5868,7 +5868,7 @@ static void hns_roce_v2_destroy_eqc(struct hns_roce_dev *hr_dev, u32 eqn) 
	else

		cmd = HNS_ROCE_CMD_DESTROY_AEQC;



	ret = hns_roce_cmd_mbox(hr_dev, 0, 0, cmd, eqn & HNS_ROCE_V2_EQN_M);

	ret = hns_roce_destroy_hw_ctx(hr_dev, cmd, eqn & HNS_ROCE_V2_EQN_M);

	if (ret)

		dev_err(dev, "[mailbox cmd] destroy eqc(%u) failed.\n", eqn);

}
@@ -5992,7 +5992,7 @@ static int hns_roce_v2_create_eq(struct hns_roce_dev *hr_dev, 
	if (ret)

		goto err_cmd_mbox;



	ret = hns_roce_cmd_mbox(hr_dev, mailbox->dma, 0, eq_cmd, eq->eqn);

	ret = hns_roce_create_hw_ctx(hr_dev, mailbox, eq_cmd, eq->eqn);

	if (ret) {

		dev_err(hr_dev->dev, "[mailbox cmd] create eqc failed.\n");

		goto err_cmd_mbox;