Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

4 files changed, 58 insertions, 24 deletions

diff --git a/drivers/serial/jsm/jsm.h b/drivers/serial/jsm/jsm.h
index 4e5f3bde0461..38a509c684cd 100644
--- a/drivers/serial/jsm/jsm.h
+++ b/drivers/serial/jsm/jsm.h
@@ -138,7 +138,6 @@ struct jsm_board
         u32             nasync;         /* Number of ports on card */
 
         u32             irq;            /* Interrupt request number */
-        u64             intr_count;     /* Count of interrupts */
 
         u64             membase;        /* Start of base memory of the card */
         u64             membase_end;    /* End of base memory of the card */
@@ -206,8 +205,6 @@ struct jsm_channel {
 
         u64             ch_close_delay; /* How long we should drop RTS/DTR for */
 
-        u64             ch_cpstime;     /* Time for CPS calculations    */
-
         tcflag_t        ch_c_iflag;     /* channel iflags               */
         tcflag_t        ch_c_cflag;     /* channel cflags               */
         tcflag_t        ch_c_oflag;     /* channel oflags               */
@@ -215,11 +212,6 @@ struct jsm_channel {
         u8              ch_stopc;       /* Stop character               */
         u8              ch_startc;      /* Start character              */
 
-        u32             ch_old_baud;    /* Cache of the current baud */
-        u32             ch_custom_speed;/* Custom baud, if set */
-
-        u32             ch_wopen;       /* Waiting for open process cnt */
-
         u8              ch_mostat;      /* FEP output modem status      */
         u8              ch_mistat;      /* FEP input modem status       */
 
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c
index b3604aa322a4..eaf545014119 100644
--- a/drivers/serial/jsm/jsm_driver.c
+++ b/drivers/serial/jsm/jsm_driver.c
@@ -26,6 +26,7 @@
  ***********************************************************************/
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include "jsm.h"
 
@@ -48,6 +49,17 @@ struct uart_driver jsm_uart_driver = {
         .nr             = NR_PORTS,
 };
 
+static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
+                                       pci_channel_state_t state);
+static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev);
+static void jsm_io_resume(struct pci_dev *pdev);
+
+static struct pci_error_handlers jsm_err_handler = {
+        .error_detected = jsm_io_error_detected,
+        .slot_reset = jsm_io_slot_reset,
+        .resume = jsm_io_resume,
+};
+
 int jsm_debug;
 module_param(jsm_debug, int, 0);
 MODULE_PARM_DESC(jsm_debug, "Driver debugging level");
@@ -123,7 +135,7 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
         }
 
         rc = request_irq(brd->irq, brd->bd_ops->intr,
-                        IRQF_DISABLED|IRQF_SHARED, "JSM", brd);
+                        IRQF_SHARED, "JSM", brd);
         if (rc) {
                 printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq);
                 goto out_iounmap;
@@ -164,9 +176,11 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device
         }
 
         pci_set_drvdata(pdev, brd);
+        pci_save_state(pdev);
 
         return 0;
  out_free_irq:
+        jsm_remove_uart_port(brd);
         free_irq(brd->irq, brd);
  out_iounmap:
         iounmap(brd->re_map_membase);
@@ -222,8 +236,42 @@ static struct pci_driver jsm_driver = {
         .id_table       = jsm_pci_tbl,
         .probe          = jsm_probe_one,
         .remove         = __devexit_p(jsm_remove_one),
+        .err_handler    = &jsm_err_handler,
 };
 
+static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
+                                        pci_channel_state_t state)
+{
+        struct jsm_board *brd = pci_get_drvdata(pdev);
+
+        jsm_remove_uart_port(brd);
+
+        return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev)
+{
+        int rc;
+
+        rc = pci_enable_device(pdev);
+
+        if (rc)
+                return PCI_ERS_RESULT_DISCONNECT;
+
+        pci_set_master(pdev);
+
+        return PCI_ERS_RESULT_RECOVERED;
+}
+
+static void jsm_io_resume(struct pci_dev *pdev)
+{
+        struct jsm_board *brd = pci_get_drvdata(pdev);
+
+        pci_restore_state(pdev);
+
+        jsm_uart_port_init(brd);
+}
+
 static int __init jsm_init_module(void)
 {
         int rc;
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c
index b4b124e4828f..7960d9633c15 100644
--- a/drivers/serial/jsm/jsm_neo.c
+++ b/drivers/serial/jsm/jsm_neo.c
@@ -954,13 +954,8 @@ static void neo_param(struct jsm_channel *ch)
                 ch->ch_flags |= (CH_BAUD0);
                 ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR);
                 neo_assert_modem_signals(ch);
-                ch->ch_old_baud = 0;
                 return;
 
-        } else if (ch->ch_custom_speed) {
-                        baud = ch->ch_custom_speed;
-                        if (ch->ch_flags & CH_BAUD0)
-                                ch->ch_flags &= ~(CH_BAUD0);
         } else {
                 int i;
                 unsigned int cflag;
@@ -1045,7 +1040,6 @@ static void neo_param(struct jsm_channel *ch)
         quot = ch->ch_bd->bd_dividend / baud;
 
         if (quot != 0) {
-                ch->ch_old_baud = baud;
                 writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr);
                 writeb((quot & 0xff), &ch->ch_neo_uart->txrx);
                 writeb((quot >> 8), &ch->ch_neo_uart->ier);
@@ -1123,8 +1117,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
         unsigned long lock_flags2;
         int outofloop_count = 0;
 
-        brd->intr_count++;
-
         /* Lock out the slow poller from running on this board. */
         spin_lock_irqsave(&brd->bd_intr_lock, lock_flags);
 
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 7439c0373620..7a4a914ecff0 100644
--- a/drivers/serial/jsm/jsm_tty.c
+++ b/drivers/serial/jsm/jsm_tty.c
@@ -30,6 +30,7 @@
 #include <linux/serial_reg.h>
 #include <linux/delay.h>        /* For udelay */
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include "jsm.h"
 
@@ -296,8 +297,6 @@ static void jsm_tty_close(struct uart_port *port)
                 bd->bd_ops->assert_modem_signals(channel);
         }
 
-        channel->ch_old_baud = 0;
-
         /* Turn off UART interrupts for this port */
         channel->ch_bd->bd_ops->uart_off(channel);
 
@@ -432,9 +431,9 @@ int __devinit jsm_tty_init(struct jsm_board *brd)
         return 0;
 }
 
-int __devinit jsm_uart_port_init(struct jsm_board *brd)
+int jsm_uart_port_init(struct jsm_board *brd)
 {
-        int i;
+        int i, rc;
         unsigned int line;
         struct jsm_channel *ch;
 
@@ -469,10 +468,13 @@ int __devinit jsm_uart_port_init(struct jsm_board *brd)
                 } else
                         set_bit(line, linemap);
                 brd->channels[i]->uart_port.line = line;
-                if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port))
-                        printk(KERN_INFO "jsm: add device failed\n");
+                rc = uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port);
+                if (rc){
+                        printk(KERN_INFO "jsm: Port %d failed. Aborting...\n", i);
+                        return rc;
+                }
                 else
-                        printk(KERN_INFO "Added device \n");
+                        printk(KERN_INFO "jsm: Port %d added\n", i);
         }
 
         jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");