Commit 3dcad1f8 authored by Yixing Liu's avatar Yixing Liu Committed by Doug Ledford
Browse files

RDMA/hns: Fix a spelling mistake in a macro 



HNS_ROCE_ALOGN_UP should be HNS_ROCE_ALIGN_UP, this patch fix it.

Signed-off-by: default avatarYixing Liu <liuyixing1@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Link: https://lore.kernel.org/r/1567566885-23088-6-git-send-email-liweihang@hisilicon.com


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent cfd82da4

drivers/infiniband/hw/hns/hns_roce_device.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#define HNS_ROCE_MAX_MSG_LEN			0x80000000



#define HNS_ROCE_ALOGN_UP(a, b) ((((a) + (b) - 1) / (b)) * (b))

#define HNS_ROCE_ALIGN_UP(a, b) ((((a) + (b) - 1) / (b)) * (b))



#define HNS_ROCE_IB_MIN_SQ_STRIDE		6

drivers/infiniband/hw/hns/hns_roce_qp.c

+12 −12
Original line number Diff line number Diff line
@@ -391,37 +391,37 @@ static int hns_roce_set_user_sq_size(struct hns_roce_dev *hr_dev, 


	/* Get buf size, SQ and RQ  are aligned to page_szie */

	if (hr_dev->caps.max_sq_sg <= 2) {

		hr_qp->buff_size = HNS_ROCE_ALOGN_UP((hr_qp->rq.wqe_cnt <<

		hr_qp->buff_size = HNS_ROCE_ALIGN_UP((hr_qp->rq.wqe_cnt <<

					     hr_qp->rq.wqe_shift), PAGE_SIZE) +

				   HNS_ROCE_ALOGN_UP((hr_qp->sq.wqe_cnt <<

				   HNS_ROCE_ALIGN_UP((hr_qp->sq.wqe_cnt <<

					     hr_qp->sq.wqe_shift), PAGE_SIZE);



		hr_qp->sq.offset = 0;

		hr_qp->rq.offset = HNS_ROCE_ALOGN_UP((hr_qp->sq.wqe_cnt <<

		hr_qp->rq.offset = HNS_ROCE_ALIGN_UP((hr_qp->sq.wqe_cnt <<

					     hr_qp->sq.wqe_shift), PAGE_SIZE);

	} else {

		page_size = 1 << (hr_dev->caps.mtt_buf_pg_sz + PAGE_SHIFT);

		hr_qp->sge.sge_cnt = ex_sge_num ?

		   max(page_size / (1 << hr_qp->sge.sge_shift), ex_sge_num) : 0;

		hr_qp->buff_size = HNS_ROCE_ALOGN_UP((hr_qp->rq.wqe_cnt <<

		hr_qp->buff_size = HNS_ROCE_ALIGN_UP((hr_qp->rq.wqe_cnt <<

					     hr_qp->rq.wqe_shift), page_size) +

				   HNS_ROCE_ALOGN_UP((hr_qp->sge.sge_cnt <<

				   HNS_ROCE_ALIGN_UP((hr_qp->sge.sge_cnt <<

					     hr_qp->sge.sge_shift), page_size) +

				   HNS_ROCE_ALOGN_UP((hr_qp->sq.wqe_cnt <<

				   HNS_ROCE_ALIGN_UP((hr_qp->sq.wqe_cnt <<

					     hr_qp->sq.wqe_shift), page_size);



		hr_qp->sq.offset = 0;

		if (ex_sge_num) {

			hr_qp->sge.offset = HNS_ROCE_ALOGN_UP(

			hr_qp->sge.offset = HNS_ROCE_ALIGN_UP(

							(hr_qp->sq.wqe_cnt <<

							hr_qp->sq.wqe_shift),

							page_size);

			hr_qp->rq.offset = hr_qp->sge.offset +

					HNS_ROCE_ALOGN_UP((hr_qp->sge.sge_cnt <<

					HNS_ROCE_ALIGN_UP((hr_qp->sge.sge_cnt <<

						hr_qp->sge.sge_shift),

						page_size);

		} else {

			hr_qp->rq.offset = HNS_ROCE_ALOGN_UP(

			hr_qp->rq.offset = HNS_ROCE_ALIGN_UP(

							(hr_qp->sq.wqe_cnt <<

							hr_qp->sq.wqe_shift),

							page_size);
@@ -591,19 +591,19 @@ static int hns_roce_set_kernel_sq_size(struct hns_roce_dev *hr_dev, 
	/* Get buf size, SQ and RQ are aligned to PAGE_SIZE */

	page_size = 1 << (hr_dev->caps.mtt_buf_pg_sz + PAGE_SHIFT);

	hr_qp->sq.offset = 0;

	size = HNS_ROCE_ALOGN_UP(hr_qp->sq.wqe_cnt << hr_qp->sq.wqe_shift,

	size = HNS_ROCE_ALIGN_UP(hr_qp->sq.wqe_cnt << hr_qp->sq.wqe_shift,

				 page_size);



	if (hr_dev->caps.max_sq_sg > 2 && hr_qp->sge.sge_cnt) {

		hr_qp->sge.sge_cnt = max(page_size/(1 << hr_qp->sge.sge_shift),

					(u32)hr_qp->sge.sge_cnt);

		hr_qp->sge.offset = size;

		size += HNS_ROCE_ALOGN_UP(hr_qp->sge.sge_cnt <<

		size += HNS_ROCE_ALIGN_UP(hr_qp->sge.sge_cnt <<

					  hr_qp->sge.sge_shift, page_size);

	}



	hr_qp->rq.offset = size;

	size += HNS_ROCE_ALOGN_UP((hr_qp->rq.wqe_cnt << hr_qp->rq.wqe_shift),

	size += HNS_ROCE_ALIGN_UP((hr_qp->rq.wqe_cnt << hr_qp->rq.wqe_shift),

				  page_size);

	hr_qp->buff_size = size;