net: hns3: Add PCIe AER error recovery (6ae4e733) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ struct hnae3_ae_ops {
		int (set_vf_vlan_filter)(struct hnae3_handle handle, int vfid,
		u16 vlan, u8 qos, __be16 proto);
		int (enable_hw_strip_rxvtag)(struct hnae3_handle handle, bool enable);
		void (reset_event)(struct hnae3_handle handle);
		void (reset_event)(struct pci_dev pdev, struct hnae3_handle *handle);
		void (get_channels)(struct hnae3_handle handle,
		struct ethtool_channels *ch);
		void (get_tqps_and_rss_info)(struct hnae3_handle h,

+19 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		#include <linux/ipv6.h>
		#include <linux/module.h>
		#include <linux/pci.h>
		#include <linux/aer.h>
		#include <linux/skbuff.h>
		#include <linux/sctp.h>
		#include <linux/vermagic.h>
		@@ -1613,7 +1614,7 @@ static void hns3_nic_net_timeout(struct net_device *ndev)

		/* request the reset */
		if (h->ae_algo->ops->reset_event)
		h->ae_algo->ops->reset_event(h);
		h->ae_algo->ops->reset_event(h->pdev, h);
		}

		static const struct net_device_ops hns3_nic_netdev_ops = {
		@@ -1796,8 +1797,25 @@ static pci_ers_result_t hns3_error_detected(struct pci_dev *pdev,
		return ret;
		}

		static pci_ers_result_t hns3_slot_reset(struct pci_dev *pdev)
		{
		struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);
		struct device *dev = &pdev->dev;

		dev_info(dev, "requesting reset due to PCI error\n");

		/* request the reset */
		if (ae_dev->ops->reset_event) {
		ae_dev->ops->reset_event(pdev, NULL);
		return PCI_ERS_RESULT_RECOVERED;
		}

		return PCI_ERS_RESULT_DISCONNECT;
		}

		static const struct pci_error_handlers hns3_err_handler = {
		.error_detected = hns3_error_detected,
		.slot_reset = hns3_slot_reset,
		};

		static struct pci_driver hns3_driver = {

+13 −4

Original line number	Diff line number	Diff line
		@@ -2489,12 +2489,18 @@ static void hclge_reset(struct hclge_dev *hdev)
		ae_dev->reset_type = HNAE3_NONE_RESET;
		}

		static void hclge_reset_event(struct hnae3_handle *handle)
		static void hclge_reset_event(struct pci_dev pdev, struct hnae3_handle handle)
		{
		struct hclge_vport *vport = hclge_get_vport(handle);
		struct hclge_dev *hdev = vport->back;
		struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);
		struct hclge_dev *hdev = ae_dev->priv;

		/* check if this is a new reset request and we are not here just because
		/* We might end up getting called broadly because of 2 below cases:
		* 1. Recoverable error was conveyed through APEI and only way to bring
		* normalcy is to reset.
		* 2. A new reset request from the stack due to timeout
		*
		* For the first case,error event might not have ae handle available.
		* check if this is a new reset request and we are not here just because
		* last reset attempt did not succeed and watchdog hit us again. We will
		* know this if last reset request did not occur very recently (watchdog
		* timer = 5HZ, let us check after sufficiently large time, say 45*Hz)
		@@ -2503,6 +2509,9 @@ static void hclge_reset_event(struct hnae3_handle *handle)
		* want to make sure we throttle the reset request. Therefore, we will
		* not allow it again before 3*HZ times.
		*/
		if (!handle)
		handle = &hdev->vport[0].nic;

		if (time_before(jiffies, (handle->last_reset_time + 3 * HZ)))
		return;
		else if (time_after(jiffies, (handle->last_reset_time + 4 * 5 * HZ)))

+2 −1

Original line number	Diff line number	Diff line
		@@ -1214,7 +1214,8 @@ static int hclgevf_do_reset(struct hclgevf_dev *hdev)
		return status;
		}

		static void hclgevf_reset_event(struct hnae3_handle *handle)
		static void hclgevf_reset_event(struct pci_dev *pdev,
		struct hnae3_handle *handle)
		{
		struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);