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>, <sergei.shtylyov@cogentembedded.com>,
Huazhong Tan <tanhuazhong@huawei.com>,
Peng Li <lipeng321@huawei.com>
Subject: [PATCH V2 net-next 07/12] net: hns3: simplify hclgevf_cmd_csq_clean
Date: Thu, 4 Apr 2019 16:17:54 +0800 [thread overview]
Message-ID: <1554365879-7932-8-git-send-email-tanhuazhong@huawei.com> (raw)
In-Reply-To: <1554365879-7932-1-git-send-email-tanhuazhong@huawei.com>
csq is used as a ring buffer, the value of the desc will be replaced
in next use. This patch removes the unnecessary memset, and just
updates the next_to_clean.
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
---
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 35 +++++++++++++++-------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
index 9441b45..930b175 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c
@@ -27,26 +27,39 @@ static int hclgevf_ring_space(struct hclgevf_cmq_ring *ring)
return ring->desc_num - used - 1;
}
+static int hclgevf_is_valid_csq_clean_head(struct hclgevf_cmq_ring *ring,
+ int head)
+{
+ int ntu = ring->next_to_use;
+ int ntc = ring->next_to_clean;
+
+ if (ntu > ntc)
+ return head >= ntc && head <= ntu;
+
+ return head >= ntc || head <= ntu;
+}
+
static int hclgevf_cmd_csq_clean(struct hclgevf_hw *hw)
{
+ struct hclgevf_dev *hdev = container_of(hw, struct hclgevf_dev, hw);
struct hclgevf_cmq_ring *csq = &hw->cmq.csq;
- u16 ntc = csq->next_to_clean;
- struct hclgevf_desc *desc;
int clean = 0;
u32 head;
- desc = &csq->desc[ntc];
head = hclgevf_read_dev(hw, HCLGEVF_NIC_CSQ_HEAD_REG);
- while (head != ntc) {
- memset(desc, 0, sizeof(*desc));
- ntc++;
- if (ntc == csq->desc_num)
- ntc = 0;
- desc = &csq->desc[ntc];
- clean++;
+ rmb(); /* Make sure head is ready before touch any data */
+
+ if (!hclgevf_is_valid_csq_clean_head(csq, head)) {
+ dev_warn(&hdev->pdev->dev, "wrong cmd head (%d, %d-%d)\n", head,
+ csq->next_to_use, csq->next_to_clean);
+ dev_warn(&hdev->pdev->dev,
+ "Disabling any further commands to IMP firmware\n");
+ set_bit(HCLGEVF_STATE_CMD_DISABLE, &hdev->state);
+ return -EIO;
}
- csq->next_to_clean = ntc;
+ clean = (head - csq->next_to_clean + csq->desc_num) % csq->desc_num;
+ csq->next_to_clean = head;
return clean;
}
--
2.7.4
next prev parent reply other threads:[~2019-04-04 8:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 8:17 [PATCH V2 net-next 00/12] code optimizations & bugfixes for HNS3 driver Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 01/12] net: hns3: check 1000M half for hns3_ethtool_ops.set_link_ksettings Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 02/12] net: hns3: reduce resources use in kdump kernel Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 03/12] net: hns3: modify the VF network port media type acquisition method Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 04/12] net: hns3: return 0 and print warning when hit duplicate MAC Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 05/12] net: hns3: minor optimization for ring_space Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 06/12] net: hns3: minor optimization for datapath Huazhong Tan
2019-04-04 8:17 ` Huazhong Tan [this message]
2019-04-04 8:17 ` [PATCH V2 net-next 08/12] net: hns3: add protect when handling mac addr list Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 09/12] net: hns3: check resetting status in hns3_get_stats() Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 10/12] net: hns3: prevent change MTU when resetting Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 11/12] net: hns3: modify HNS3_NIC_STATE_INITED flag in hns3_reset_notify_uninit_enet Huazhong Tan
2019-04-04 8:17 ` [PATCH V2 net-next 12/12] net: hns3: split function hnae3_match_n_instantiate() Huazhong Tan
2019-04-04 17:20 ` [PATCH V2 net-next 00/12] 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=1554365879-7932-8-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=lipeng321@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
--cc=sergei.shtylyov@cogentembedded.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).