From: Salil Mehta <salil.mehta@huawei.com>
To: <dledford@redhat.com>
Cc: <salil.mehta@huawei.com>, <xavier.huwei@huawei.com>,
<oulijun@huawei.com>, <yisen.zhuang@huawei.com>,
<xuwei5@hisilicon.com>, <mehta.salil.lnk@gmail.com>,
<linux-rdma@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>
Subject: [PATCH for-next 08/20] IB/hns: Delete the sqp_start from the structure hns_roce_caps
Date: Fri, 9 Sep 2016 18:30:39 +0800 [thread overview]
Message-ID: <1473417051-99560-9-git-send-email-salil.mehta@huawei.com> (raw)
In-Reply-To: <1473417051-99560-1-git-send-email-salil.mehta@huawei.com>
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
This patch deleted the sqp_start from the structure hns_roce_caps, and
modified the calculation of the qp number.
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
drivers/infiniband/hw/hns/hns_roce_device.h | 1 -
drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 1 -
drivers/infiniband/hw/hns/hns_roce_qp.c | 10 ++++------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index f01cc2f..7643716 100644
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -464,7 +464,6 @@ struct hns_roce_caps {
u32 max_rq_desc_sz; /* 64 */
int max_qp_init_rdma;
int max_qp_dest_rdma;
- int sqp_start;
int num_cqs;
int max_cqes;
int reserved_cqs;
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
index f6bb88c..f4d2515 100644
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
@@ -942,7 +942,6 @@ void hns_roce_v1_profile(struct hns_roce_dev *hr_dev)
caps->mtt_entry_sz = HNS_ROCE_V1_MTT_ENTRY_SIZE;
caps->cq_entry_sz = HNS_ROCE_V1_CQE_ENTRY_SIZE;
caps->page_size_cap = HNS_ROCE_V1_PAGE_SIZE_SUPPORT;
- caps->sqp_start = 0;
caps->reserved_lkey = 0;
caps->reserved_pds = 0;
caps->reserved_mrws = 1;
diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index 755a4b8..51fefbf 100644
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -39,7 +39,7 @@
#include "hns_roce_user.h"
#define DB_REG_OFFSET 0x1000
-#define SQP_NUM 12
+#define SQP_NUM (2 * HNS_ROCE_MAX_PORTS)
void hns_roce_qp_event(struct hns_roce_dev *hr_dev, u32 qpn, int event_type)
{
@@ -247,7 +247,7 @@ void hns_roce_release_range_qp(struct hns_roce_dev *hr_dev, int base_qpn,
{
struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;
- if (base_qpn < (hr_dev->caps.sqp_start + 2 * hr_dev->caps.num_ports))
+ if (base_qpn < SQP_NUM)
return;
hns_roce_bitmap_free_range(&qp_table->bitmap, base_qpn, cnt);
@@ -609,8 +609,7 @@ struct ib_qp *hns_roce_create_qp(struct ib_pd *pd,
hr_qp = &hr_sqp->hr_qp;
hr_qp->port = init_attr->port_num - 1;
hr_qp->phy_port = hr_dev->iboe.phy_port[hr_qp->port];
- hr_qp->ibqp.qp_num = hr_dev->caps.sqp_start +
- HNS_ROCE_MAX_PORTS +
+ hr_qp->ibqp.qp_num = HNS_ROCE_MAX_PORTS +
hr_dev->iboe.phy_port[hr_qp->port];
ret = hns_roce_create_qp_common(hr_dev, pd, init_attr, udata,
@@ -826,8 +825,7 @@ int hns_roce_init_qp_table(struct hns_roce_dev *hr_dev)
/* A port include two SQP, six port total 12 */
ret = hns_roce_bitmap_init(&qp_table->bitmap, hr_dev->caps.num_qps,
- hr_dev->caps.num_qps - 1,
- hr_dev->caps.sqp_start + SQP_NUM,
+ hr_dev->caps.num_qps - 1, SQP_NUM,
reserved_from_top);
if (ret) {
dev_err(&hr_dev->pdev->dev, "qp bitmap init failed!error=%d\n",
--
1.7.9.5
next prev parent reply other threads:[~2016-09-09 10:14 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 10:30 [PATCH for-next 00/20] IB/hns: Fixes for various misc. bugs Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 01/20] IB/hns: Remove unused parameters in some functions Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 02/20] IB/hns: Remove parameters of resize cq Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 03/20] IB/hns: Add the check for pointer ctrl Salil Mehta
2016-09-15 10:07 ` Leon Romanovsky
2016-09-20 16:50 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 04/20] IB/hns: Fix bug of using uninit refcount and free Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 05/20] IB/hns: Simplify function of pd alloc and qp alloc Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 06/20] IB/hns: Remove unused parameter named qp_type Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 07/20] IB/hns: Fix bug of clear hem Salil Mehta
2016-09-09 10:30 ` Salil Mehta [this message]
2016-09-09 10:30 ` [PATCH for-next 09/20] IB/hns: Optimize code of aeq and ceq interrupt handle and fix the bug of qpn Salil Mehta
2016-09-12 12:32 ` Leon Romanovsky
2016-09-12 15:47 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 10/20] IB/hns: Modify the init of iboe lock Salil Mehta
2016-09-13 6:50 ` Leon Romanovsky
2016-09-14 2:09 ` Salil Mehta
2016-09-14 5:04 ` Leon Romanovsky
2016-09-15 3:49 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 11/20] IB/hns: Fix bug of memory leakage for registering user mr Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 12/20] IB/hns: Return bad wr while post send failed Salil Mehta
2016-09-15 9:07 ` Leon Romanovsky
2016-09-20 16:46 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 13/20] IB/hns: Add check for some NULL pointer scenes Salil Mehta
2016-09-13 6:59 ` Leon Romanovsky
2016-09-15 3:41 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 14/20] IB/hns: The Ack timeout need a lower limit value Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 15/20] IB/hns: Some items of qpc need to take user param Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 16/20] IB/hns: Validate mtu when modified qp Salil Mehta
2016-09-13 6:32 ` Leon Romanovsky
2016-09-14 2:07 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 17/20] IB/hns: Cq has not been freed Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 18/20] IB/hns: Update the rq head when modify qp state Salil Mehta
2016-09-15 10:12 ` Leon Romanovsky
2016-09-20 16:56 ` Salil Mehta
2016-09-20 17:05 ` Leon Romanovsky
2016-09-20 17:49 ` Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 19/20] IB/hns: Fix the bug when platform_get_resource() exec fail Salil Mehta
2016-09-09 10:30 ` [PATCH for-next 20/20] IB/hns: Delete the redundant lines in hns_roce_v1_m_qp() Salil Mehta
2016-09-15 10:15 ` Leon Romanovsky
2016-09-20 16:57 ` Salil Mehta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473417051-99560-9-git-send-email-salil.mehta@huawei.com \
--to=salil.mehta@huawei.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=mehta.salil.lnk@gmail.com \
--cc=oulijun@huawei.com \
--cc=xavier.huwei@huawei.com \
--cc=xuwei5@hisilicon.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®