diff options
| author | Shiju Jose <shiju.jose@huawei.com> | 2019-06-13 17:12:24 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-14 19:26:15 -0700 |
| commit | e3b84ed27043d66a75cd229adc05426b6847dfa6 (patch) | |
| tree | b329879dd17f259229b8054a6977b407d4d77f43 | |
| parent | e4193e24a52016d9088e796c313f6eb3c9c540e0 (diff) | |
| download | linux-e3b84ed27043d66a75cd229adc05426b6847dfa6.tar.gz linux-e3b84ed27043d66a75cd229adc05426b6847dfa6.tar.bz2 linux-e3b84ed27043d66a75cd229adc05426b6847dfa6.zip | |
net: hns3: add recovery for the H/W errors occurred before the HNS dev initialization
This patch adds the recovery for the HNS H/W errors which occurred
before the driver initialization.
Reported-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index d9863c300b1d..6761d725bb12 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3236,6 +3236,7 @@ static bool hclge_reset_err_handle(struct hclge_dev *hdev, bool is_timeout) dev_info(&hdev->pdev->dev, "Upgrade reset level\n"); hclge_clear_reset_cause(hdev); + set_bit(HNAE3_GLOBAL_RESET, &hdev->default_reset_request); mod_timer(&hdev->reset_timer, jiffies + HCLGE_RESET_INTERVAL); @@ -3430,8 +3431,7 @@ static void hclge_reset_timer(struct timer_list *t) struct hclge_dev *hdev = from_timer(hdev, t, reset_timer); dev_info(&hdev->pdev->dev, - "triggering global reset in reset timer\n"); - set_bit(HNAE3_GLOBAL_RESET, &hdev->default_reset_request); + "triggering reset in reset timer\n"); hclge_reset_event(hdev->pdev, NULL); } @@ -8614,6 +8614,18 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev) /* Log and clear the hw errors those already occurred */ hclge_handle_all_hns_hw_errors(ae_dev); + /* request delayed reset for the error recovery because an immediate + * global reset on a PF affecting pending initialization of other PFs + */ + if (ae_dev->hw_err_reset_req) { + enum hnae3_reset_type reset_level; + + reset_level = hclge_get_reset_level(ae_dev, + &ae_dev->hw_err_reset_req); + hclge_set_def_reset_request(ae_dev, reset_level); + mod_timer(&hdev->reset_timer, jiffies + HCLGE_RESET_INTERVAL); + } + /* Enable MISC vector(vector0) */ hclge_enable_vector(&hdev->misc_vector, true); |