Commit 6b877c32 authored by Wei Hu (Xavier)'s avatar Wei Hu (Xavier) Committed by Doug Ledford
Browse files

IB/hns: Modify the macro for the timeout when cmd process 



This patch modified the macro for the timeout when cmd is
processing as follows:
Before modification:
 enum {
	HNS_ROCE_CMD_TIME_CLASS_A       = 10000,
	HNS_ROCE_CMD_TIME_CLASS_B       = 10000,
	HNS_ROCE_CMD_TIME_CLASS_C       = 10000,
 };
After modification:
 #define HNS_ROCE_CMD_TIMEOUT_MSECS	10000

Signed-off-by: default avatarWei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1dec243a

drivers/infiniband/hw/hns/hns_roce_cmd.h

+1 −6
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define _HNS_ROCE_CMD_H



#define HNS_ROCE_MAILBOX_SIZE		4096

#define HNS_ROCE_CMD_TIMEOUT_MSECS	10000



enum {

	/* TPT commands */
@@ -57,12 +58,6 @@ enum { 
	HNS_ROCE_CMD_QUERY_QP		= 0x22,

};



enum {

	HNS_ROCE_CMD_TIME_CLASS_A	= 10000,

	HNS_ROCE_CMD_TIME_CLASS_B	= 10000,

	HNS_ROCE_CMD_TIME_CLASS_C	= 10000,

};



struct hns_roce_cmd_mailbox {

	void		       *buf;

	dma_addr_t		dma;

drivers/infiniband/hw/hns/hns_roce_cq.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int hns_roce_sw2hw_cq(struct hns_roce_dev *dev, 
			     unsigned long cq_num)

{

	return hns_roce_cmd_mbox(dev, mailbox->dma, 0, cq_num, 0,

			    HNS_ROCE_CMD_SW2HW_CQ, HNS_ROCE_CMD_TIME_CLASS_A);

			    HNS_ROCE_CMD_SW2HW_CQ, HNS_ROCE_CMD_TIMEOUT_MSECS);

}



static int hns_roce_cq_alloc(struct hns_roce_dev *hr_dev, int nent,
@@ -176,7 +176,7 @@ static int hns_roce_hw2sw_cq(struct hns_roce_dev *dev, 
{

	return hns_roce_cmd_mbox(dev, 0, mailbox ? mailbox->dma : 0, cq_num,

				 mailbox ? 0 : 1, HNS_ROCE_CMD_HW2SW_CQ,

				 HNS_ROCE_CMD_TIME_CLASS_A);

				 HNS_ROCE_CMD_TIMEOUT_MSECS);

}



static void hns_roce_free_cq(struct hns_roce_dev *hr_dev,

drivers/infiniband/hw/hns/hns_roce_hw_v1.c

+4 −4
Original line number Diff line number Diff line
@@ -1871,12 +1871,12 @@ static int hns_roce_v1_qp_modify(struct hns_roce_dev *hr_dev, 
	if (op[cur_state][new_state] == HNS_ROCE_CMD_2RST_QP)

		return hns_roce_cmd_mbox(hr_dev, 0, 0, hr_qp->qpn, 2,

					 HNS_ROCE_CMD_2RST_QP,

					 HNS_ROCE_CMD_TIME_CLASS_A);

					 HNS_ROCE_CMD_TIMEOUT_MSECS);



	if (op[cur_state][new_state] == HNS_ROCE_CMD_2ERR_QP)

		return hns_roce_cmd_mbox(hr_dev, 0, 0, hr_qp->qpn, 2,

					 HNS_ROCE_CMD_2ERR_QP,

					 HNS_ROCE_CMD_TIME_CLASS_A);

					 HNS_ROCE_CMD_TIMEOUT_MSECS);



	mailbox = hns_roce_alloc_cmd_mailbox(hr_dev);

	if (IS_ERR(mailbox))
@@ -1886,7 +1886,7 @@ static int hns_roce_v1_qp_modify(struct hns_roce_dev *hr_dev, 


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

				op[cur_state][new_state],

				HNS_ROCE_CMD_TIME_CLASS_C);

				HNS_ROCE_CMD_TIMEOUT_MSECS);



	hns_roce_free_cmd_mailbox(hr_dev, mailbox);

	return ret;
@@ -2681,7 +2681,7 @@ static int hns_roce_v1_query_qpc(struct hns_roce_dev *hr_dev, 


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

				HNS_ROCE_CMD_QUERY_QP,

				HNS_ROCE_CMD_TIME_CLASS_A);

				HNS_ROCE_CMD_TIMEOUT_MSECS);

	if (!ret)

		memcpy(hr_context, mailbox->buf, sizeof(*hr_context));

	else

drivers/infiniband/hw/hns/hns_roce_mr.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static int hns_roce_sw2hw_mpt(struct hns_roce_dev *hr_dev, 
{

	return hns_roce_cmd_mbox(hr_dev, mailbox->dma, 0, mpt_index, 0,

				 HNS_ROCE_CMD_SW2HW_MPT,

				 HNS_ROCE_CMD_TIME_CLASS_B);

				 HNS_ROCE_CMD_TIMEOUT_MSECS);

}



static int hns_roce_hw2sw_mpt(struct hns_roce_dev *hr_dev,
@@ -62,7 +62,7 @@ static int hns_roce_hw2sw_mpt(struct hns_roce_dev *hr_dev, 
{

	return hns_roce_cmd_mbox(hr_dev, 0, mailbox ? mailbox->dma : 0,

				 mpt_index, !mailbox, HNS_ROCE_CMD_HW2SW_MPT,

				 HNS_ROCE_CMD_TIME_CLASS_B);

				 HNS_ROCE_CMD_TIMEOUT_MSECS);

}



static int hns_roce_buddy_alloc(struct hns_roce_buddy *buddy, int order,

CRA Git | Maintained and supported by SUSTech CRA and CCSE