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>
Subject: [PATCH net-next 07/12] net: hns3: do not request reset when hardware resetting
Date: Sat, 6 Apr 2019 15:43:31 +0800 [thread overview]
Message-ID: <1554536616-24977-8-git-send-email-tanhuazhong@huawei.com> (raw)
In-Reply-To: <1554536616-24977-1-git-send-email-tanhuazhong@huawei.com>
When hardware reset does not finish, the driver should not
request a new reset, otherwise the ongoing hardware reset
will get problem.
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 6e8fa2e..1c93da2 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -32,6 +32,7 @@
static int hclge_set_mac_mtu(struct hclge_dev *hdev, int new_mps);
static int hclge_init_vlan_config(struct hclge_dev *hdev);
static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev);
+static bool hclge_get_hw_reset_stat(struct hnae3_handle *handle);
static int hclge_set_umv_space(struct hclge_dev *hdev, u16 space_size,
u16 *allocated_size, bool is_alloc);
@@ -2714,9 +2715,18 @@ int hclge_func_reset_cmd(struct hclge_dev *hdev, int func_id)
static void hclge_do_reset(struct hclge_dev *hdev)
{
+ struct hnae3_handle *handle = &hdev->vport[0].nic;
struct pci_dev *pdev = hdev->pdev;
u32 val;
+ if (hclge_get_hw_reset_stat(handle)) {
+ dev_info(&pdev->dev, "Hardware reset not finish\n");
+ dev_info(&pdev->dev, "func_rst_reg:0x%x, global_rst_reg:0x%x\n",
+ hclge_read_dev(&hdev->hw, HCLGE_FUN_RST_ING),
+ hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG));
+ return;
+ }
+
switch (hdev->reset_type) {
case HNAE3_GLOBAL_RESET:
val = hclge_read_dev(&hdev->hw, HCLGE_GLOBAL_RESET_REG);
--
2.7.4
next prev parent reply other threads:[~2019-04-06 7:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-06 7:43 [PATCH net-next 00/12] code optimizations & bugfixes for HNS3 driver Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 01/12] net: hns3: set vport alive state to default while resetting Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 02/12] net: hns3: set up the vport alive state while reinitializing Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 03/12] net: hns3: not reset vport who not alive when PF reset Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 04/12] net: hns3: adjust the timing of hns3_client_stop when unloading Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 05/12] net: hns3: deactive the reset timer when reset successfully Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 06/12] net: hns3: ignore lower-level new coming reset Huazhong Tan
2019-04-06 7:43 ` Huazhong Tan [this message]
2019-04-06 7:43 ` [PATCH net-next 08/12] net: hns3: handle pending reset while reset fail Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 09/12] net: hns3: stop mailbox handling when command queue need re-init Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 10/12] net: hns3: add error handler for initializing command queue Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 11/12] net: hns3: remove resetting check in hclgevf_reset_task_schedule Huazhong Tan
2019-04-06 7:43 ` [PATCH net-next 12/12] net: hns3: fix keep_alive_timer not stop problem Huazhong Tan
2019-04-08 22:31 ` [PATCH 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=1554536616-24977-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=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