From 2171f4f82a3dd8293e6d069b248a0edc5406ee6c Mon Sep 17 00:00:00 2001
From: Michael Reed <mreed@linux.vnet.ibm.com>
Date: Tue, 31 May 2011 12:06:28 -0500
Subject: [PATCH] --- yaml --- r: 259319 b: refs/heads/master c:
 2807190b69f60ce4a04a9c7c523c9bce8cb62b2e h: refs/heads/master i:   259317:
 9f301889c9039e7ed1efd780ea856784525b157d   259315:
 73455f75fcc69254c6b43f85a91199d1f33f4bfc   259311:
 d6a19049152d59c45d90ec73cf623f5a842b8f76 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/tty/serial/8250_pci.c | 47 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 59ee0369971a..fa9152562408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae92c1f5e7b6708371365d262625ac19e67c1e79
+refs/heads/master: 2807190b69f60ce4a04a9c7c523c9bce8cb62b2e
diff --git a/trunk/drivers/tty/serial/8250_pci.c b/trunk/drivers/tty/serial/8250_pci.c
index e1d4668f86ae..ae2188ce0670 100644
--- a/trunk/drivers/tty/serial/8250_pci.c
+++ b/trunk/drivers/tty/serial/8250_pci.c
@@ -2708,6 +2708,7 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 	board = &pci_boards[ent->driver_data];
 
 	rc = pci_enable_device(dev);
+	pci_save_state(dev);
 	if (rc)
 		return rc;
 
@@ -4002,6 +4003,51 @@ static struct pci_device_id serial_pci_tbl[] = {
 	{ 0, }
 };
 
+static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev,
+						pci_channel_state_t state)
+{
+	struct serial_private *priv = pci_get_drvdata(dev);
+
+	if (state == pci_channel_io_perm_failure)
+		return PCI_ERS_RESULT_DISCONNECT;
+
+	if (priv)
+		pciserial_suspend_ports(priv);
+
+	pci_disable_device(dev);
+
+	return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev)
+{
+	int rc;
+
+	rc = pci_enable_device(dev);
+
+	if (rc)
+		return PCI_ERS_RESULT_DISCONNECT;
+
+	pci_restore_state(dev);
+	pci_save_state(dev);
+
+	return PCI_ERS_RESULT_RECOVERED;
+}
+
+static void serial8250_io_resume(struct pci_dev *dev)
+{
+	struct serial_private *priv = pci_get_drvdata(dev);
+
+	if (priv)
+		pciserial_resume_ports(priv);
+}
+
+static struct pci_error_handlers serial8250_err_handler = {
+	.error_detected = serial8250_io_error_detected,
+	.slot_reset = serial8250_io_slot_reset,
+	.resume = serial8250_io_resume,
+};
+
 static struct pci_driver serial_pci_driver = {
 	.name		= "serial",
 	.probe		= pciserial_init_one,
@@ -4011,6 +4057,7 @@ static struct pci_driver serial_pci_driver = {
 	.resume		= pciserial_resume_one,
 #endif
 	.id_table	= serial_pci_tbl,
+	.err_handler	= &serial8250_err_handler,
 };
 
 static int __init serial8250_pci_init(void)