Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5e67d1 authored by Weihang Li's avatar Weihang Li Committed by David S. Miller
Browse files

net: hns3: remove override_pci_need_reset 



We add override_pci_need_reset to prevent redundant and unwanted PF
resets if a RAS error occurs in commit 69b51bbb ("net: hns3: fix
to stop multiple HNS reset due to the AER changes").

Now in HNS3 driver, we use hw_err_reset_req to record reset level that
we need to recover from a RAS error. This variable cans solve above
issue as override_pci_need_reset, so this patch removes
override_pci_need_reset.

Signed-off-by: default avatarWeihang Li <liweihang@hisilicon.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4b9bd92

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ struct hnae3_ae_dev { 
	const struct hnae3_ae_ops *ops;

	struct list_head node;

	u32 flag;

	u8 override_pci_need_reset; /* fix to stop multiple reset happening */

	unsigned long hw_err_reset_req;

	enum hnae3_reset_type reset_type;

	void *priv;

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+1 −1
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ static pci_ers_result_t hns3_slot_reset(struct pci_dev *pdev) 
	ops = ae_dev->ops;

	/* request the reset */

	if (ops->reset_event) {

		if (!ae_dev->override_pci_need_reset) {

		if (ae_dev->hw_err_reset_req) {

			reset_type = ops->get_reset_level(ae_dev,

						&ae_dev->hw_err_reset_req);

			ops->set_default_reset_request(ae_dev, reset_type);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c

+1 −4
Original line number Diff line number Diff line
@@ -1627,13 +1627,10 @@ pci_ers_result_t hclge_handle_hw_ras_error(struct hnae3_ae_dev *ae_dev) 
	if (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))

		goto out;



	if (ae_dev->hw_err_reset_req) {

		ae_dev->override_pci_need_reset = 0;

	if (ae_dev->hw_err_reset_req)

		return PCI_ERS_RESULT_NEED_RESET;

	}



out:

	ae_dev->override_pci_need_reset = 1;

	return PCI_ERS_RESULT_RECOVERED;

}