From: Huazhong Tan <tanhuazhong@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
<linuxarm@huawei.com>, Huazhong Tan <tanhuazhong@huawei.com>,
Yunsheng Lin <linyunsheng@huawei.com>,
Peng Li <lipeng321@huawei.com>
Subject: [PATCH net-next 09/12] net: hns3: adjust the use of alloc_tqps and num_tqps
Date: Fri, 18 Jan 2019 16:13:11 +0800 [thread overview]
Message-ID: <1547799194-38212-10-git-send-email-tanhuazhong@huawei.com> (raw)
In-Reply-To: <1547799194-38212-1-git-send-email-tanhuazhong@huawei.com>
The alloc_tqps field of struct hclge_vport represents the total number
of tqps allocated to the vport. The num_tqps of struct
hnae3_knic_private_info indicates the total number of all enabled tqps,
which needs to be distinguished during use.
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 55a456f..9506c52 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -1123,7 +1123,7 @@ static int hclge_map_tqp_to_vport(struct hclge_dev *hdev,
u16 i;
kinfo = &nic->kinfo;
- for (i = 0; i < kinfo->num_tqps; i++) {
+ for (i = 0; i < vport->alloc_tqps; i++) {
struct hclge_tqp *q =
container_of(kinfo->tqp[i], struct hclge_tqp, q);
bool is_pf;
@@ -5241,6 +5241,7 @@ static int hclge_set_loopback(struct hnae3_handle *handle,
enum hnae3_loop loop_mode, bool en)
{
struct hclge_vport *vport = hclge_get_vport(handle);
+ struct hnae3_knic_private_info *kinfo;
struct hclge_dev *hdev = vport->back;
int i, ret;
@@ -5259,7 +5260,8 @@ static int hclge_set_loopback(struct hnae3_handle *handle,
break;
}
- for (i = 0; i < vport->alloc_tqps; i++) {
+ kinfo = &vport->nic.kinfo;
+ for (i = 0; i < kinfo->num_tqps; i++) {
ret = hclge_tqp_enable(hdev, i, 0, en);
if (ret)
return ret;
@@ -5271,11 +5273,13 @@ static int hclge_set_loopback(struct hnae3_handle *handle,
static void hclge_reset_tqp_stats(struct hnae3_handle *handle)
{
struct hclge_vport *vport = hclge_get_vport(handle);
+ struct hnae3_knic_private_info *kinfo;
struct hnae3_queue *queue;
struct hclge_tqp *tqp;
int i;
- for (i = 0; i < vport->alloc_tqps; i++) {
+ kinfo = &vport->nic.kinfo;
+ for (i = 0; i < kinfo->num_tqps; i++) {
queue = handle->kinfo.tqp[i];
tqp = container_of(queue, struct hclge_tqp, q);
memset(&tqp->tqp_stats, 0, sizeof(tqp->tqp_stats));
--
2.7.4
next prev parent reply other threads:[~2019-01-18 8:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 8:13 [PATCH net-next 00/12] net: hns3: code optimizations & bugfixes for HNS3 driver Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 01/12] net: hns3: modify enet reinitialization interface Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 02/12] net: hns3: remove unused member in struct hns3_enet_ring Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 03/12] net: hns3: remove unnecessary hns3_adjust_tqps_num Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 04/12] net: hns3: reuse reinitialization interface in the hns3_set_channels Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 05/12] net: hns3: add interface hclge_tm_bp_setup Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 06/12] net: hns3: modify parameter checks in the hns3_set_channels Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 07/12] net: hns3: remove redundant codes in hclge_knic_setup Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 08/12] net: hns3: fix user configuration loss for ethtool -L Huazhong Tan
2019-01-18 8:13 ` Huazhong Tan [this message]
2019-01-18 8:13 ` [PATCH net-next 10/12] net: hns3: fix wrong combined count returned by ethtool -l Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 11/12] net: hns3: do reinitialization while ETS configuration changed Huazhong Tan
2019-01-18 8:13 ` [PATCH net-next 12/12] net: hns3: add HNAE3_RESTORE_CLIENT interface in enet module Huazhong Tan
2019-01-18 23:10 ` [PATCH net-next 00/12] net: hns3: code optimizations & bugfixes for HNS3 driver David Miller
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=1547799194-38212-10-git-send-email-tanhuazhong@huawei.com \
--to=tanhuazhong@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=linyunsheng@huawei.com \
--cc=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.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;
as well as URLs for NNTP newsgroup(s).