2 files changed, 30 insertions, 0 deletions

diff --git a/include/linux/aer.h b/include/linux/aer.h
new file mode 100644
index 000000000000..402e178b38eb
--- /dev/null
+++ b/include/linux/aer.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2006 Intel Corp.
+ *     Tom Long Nguyen (tom.l.nguyen@intel.com)
+ *     Zhang Yanmin (yanmin.zhang@intel.com)
+ */
+
+#ifndef _AER_H_
+#define _AER_H_
+
+#if defined(CONFIG_PCIEAER)
+/* pci-e port driver needs this function to enable aer */
+extern int pci_enable_pcie_error_reporting(struct pci_dev *dev);
+extern int pci_find_aer_capability(struct pci_dev *dev);
+extern int pci_disable_pcie_error_reporting(struct pci_dev *dev);
+extern int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);
+#else
+#define pci_enable_pcie_error_reporting(dev)            do { } while (0)
+#define pci_find_aer_capability(dev)                    do { } while (0)
+#define pci_disable_pcie_error_reporting(dev)           do { } while (0)
+#define pci_cleanup_aer_uncorrect_error_status(dev)     do { } while (0)
+#endif
+
+#endif //_AER_H_
+
diff --git a/include/linux/pcieport_if.h b/include/linux/pcieport_if.h
index b44e01a70914..6cd91e3f9820 100644
--- a/include/linux/pcieport_if.h
+++ b/include/linux/pcieport_if.h
@@ -62,6 +62,12 @@ struct pcie_port_service_driver {
         int (*suspend) (struct pcie_device *dev, pm_message_t state);
         int (*resume) (struct pcie_device *dev);
 
+        /* Service Error Recovery Handler */
+        struct pci_error_handlers *err_handler;
+
+        /* Link Reset Capability - AER service driver specific */
+        pci_ers_result_t (*reset_link) (struct pci_dev *dev);
+
         const struct pcie_port_service_id *id_table;
         struct device_driver driver;
 };