Commit 4ddeacf6 authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Normalization the judgment of some features 

Whether to enable the these features should better depend on the enable
flags, not the value of related fields.

Fixes: 5c1f167a ("RDMA/hns: Init SRQ table for hip08")
Fixes: 3cb2c996 ("RDMA/hns: Add support for SCCC in size of 64 Bytes")
Link: https://lore.kernel.org/r/1607650657-35992-3-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 1c0ca9cd

drivers/infiniband/hw/hns/hns_roce_hem.c

+2 −2
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ 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.srqc_entry_sz)

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->srq_table.table);

	hns_roce_cleanup_hem_table(hr_dev, &hr_dev->cq_table.table);
@@ -1038,7 +1038,7 @@ void hns_roce_cleanup_hem(struct hns_roce_dev *hr_dev) 
	if (hr_dev->caps.cqc_timer_entry_sz)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->cqc_timer_table);

	if (hr_dev->caps.sccc_sz)

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->qp_table.sccc_table);

	if (hr_dev->caps.trrl_entry_sz)

drivers/infiniband/hw/hns/hns_roce_main.c

+4 −4
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev) 
		goto err_unmap_trrl;

	}



	if (hr_dev->caps.srqc_entry_sz) {

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ) {

		ret = hns_roce_init_hem_table(hr_dev, &hr_dev->srq_table.table,

					      HEM_TYPE_SRQC,

					      hr_dev->caps.srqc_entry_sz,
@@ -618,7 +618,7 @@ static int hns_roce_init_hem(struct hns_roce_dev *hr_dev) 
		}

	}



	if (hr_dev->caps.sccc_sz) {

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL) {

		ret = hns_roce_init_hem_table(hr_dev,

					      &hr_dev->qp_table.sccc_table,

					      HEM_TYPE_SCCC,
@@ -679,11 +679,11 @@ err_unmap_qpc_timer: 
		hns_roce_cleanup_hem_table(hr_dev, &hr_dev->qpc_timer_table);



err_unmap_ctx:

	if (hr_dev->caps.sccc_sz)

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL)

		hns_roce_cleanup_hem_table(hr_dev,

					   &hr_dev->qp_table.sccc_table);

err_unmap_srq:

	if (hr_dev->caps.srqc_entry_sz)

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ)

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



err_unmap_cq:

drivers/infiniband/hw/hns/hns_roce_qp.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int alloc_qpc(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp) 
		}

	}



	if (hr_dev->caps.sccc_sz) {

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL) {

		/* Alloc memory for SCC CTX */

		ret = hns_roce_table_get(hr_dev, &qp_table->sccc_table,

					 hr_qp->qpn);

CRA Git | Maintained and supported by SUSTech CRA and CCSE