Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
  amba pl011: workaround for uart registers lockup
  n_gsm: fix the wrong FCS handling
  pch_uart: add missing comment about OKI ML7223
  pch_uart: Add MSI support
  tty: fix "IRQ45: nobody cared"
  PTI feature to allow user to name and mark masterchannel request.
  0 for o PTI Makefile bug.
  tty: serial: samsung.c remove legacy PM code.
  SERIAL: SC26xx: Fix link error.
  serial: mrst_max3110: initialize waitqueue earlier
  mrst_max3110: Change max missing message priority.
  tty: s5pv210: Add delay loop on fifo reset function for UART
  tty/serial: Fix XSCALE serial ports, e.g. ce4100
  serial: bfin_5xx: fix off-by-one with resource size
  drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
  tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
  tty: n_gsm: Add raw-ip support
  tty: n_gsm: expose gsmtty device nodes at ldisc open time
  pch_phub: Fix register miss-setting issue
  serial: 8250, increase PASS_LIMIT
  ...

6 files changed, 211 insertions, 20 deletions

diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index b4129f53fb1b..f2dfec82faf8 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -81,7 +81,7 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */
 #define DEBUG_INTR(fmt...)      do { } while (0)
 #endif
 
-#define PASS_LIMIT      256
+#define PASS_LIMIT      512
 
 #define BOTH_EMPTY      (UART_LSR_TEMT | UART_LSR_THRE)
 
@@ -1107,7 +1107,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
                          */
                         DEBUG_AUTOCONF("Xscale ");
                         up->port.type = PORT_XSCALE;
-                        up->capabilities |= UART_CAP_UUE;
+                        up->capabilities |= UART_CAP_UUE | UART_CAP_RTOIE;
                         return;
                 }
         } else {
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index cf35e0dc5085..6b887d90a205 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -39,6 +39,7 @@ struct pci_serial_quirk {
         u32     device;
         u32     subvendor;
         u32     subdevice;
+        int     (*probe)(struct pci_dev *dev);
         int     (*init)(struct pci_dev *dev);
         int     (*setup)(struct serial_private *,
                          const struct pciserial_board *,
@@ -56,6 +57,9 @@ struct serial_private {
         int                     line[0];
 };
 
+static int pci_default_setup(struct serial_private*,
+          const struct pciserial_board*, struct uart_port*, int);
+
 static void moan_device(const char *str, struct pci_dev *dev)
 {
         printk(KERN_WARNING
@@ -571,6 +575,28 @@ static const struct timedia_struct {
         { 8, timedia_eight_port }
 };
 
+/*
+ * There are nearly 70 different Timedia/SUNIX PCI serial devices.  Instead of
+ * listing them individually, this driver merely grabs them all with
+ * PCI_ANY_ID.  Some of these devices, however, also feature a parallel port,
+ * and should be left free to be claimed by parport_serial instead.
+ */
+static int pci_timedia_probe(struct pci_dev *dev)
+{
+        /*
+         * Check the third digit of the subdevice ID
+         * (0,2,3,5,6: serial only -- 7,8,9: serial + parallel)
+         */
+        if ((dev->subsystem_device & 0x00f0) >= 0x70) {
+                dev_info(&dev->dev,
+                        "ignoring Timedia subdevice %04x for parport_serial\n",
+                        dev->subsystem_device);
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int pci_timedia_init(struct pci_dev *dev)
 {
         const unsigned short *ids;
@@ -752,6 +778,62 @@ pci_ni8430_setup(struct serial_private *priv,
         return setup_port(priv, port, bar, offset, board->reg_shift);
 }
 
+static int pci_netmos_9900_setup(struct serial_private *priv,
+                                const struct pciserial_board *board,
+                                struct uart_port *port, int idx)
+{
+        unsigned int bar;
+
+        if ((priv->dev->subsystem_device & 0xff00) == 0x3000) {
+                /* netmos apparently orders BARs by datasheet layout, so serial
+                 * ports get BARs 0 and 3 (or 1 and 4 for memmapped)
+                 */
+                bar = 3 * idx;
+
+                return setup_port(priv, port, bar, 0, board->reg_shift);
+        } else {
+                return pci_default_setup(priv, board, port, idx);
+        }
+}
+
+/* the 99xx series comes with a range of device IDs and a variety
+ * of capabilities:
+ *
+ * 9900 has varying capabilities and can cascade to sub-controllers
+ *   (cascading should be purely internal)
+ * 9904 is hardwired with 4 serial ports
+ * 9912 and 9922 are hardwired with 2 serial ports
+ */
+static int pci_netmos_9900_numports(struct pci_dev *dev)
+{
+        unsigned int c = dev->class;
+        unsigned int pi;
+        unsigned short sub_serports;
+
+        pi = (c & 0xff);
+
+        if (pi == 2) {
+                return 1;
+        } else if ((pi == 0) &&
+                           (dev->device == PCI_DEVICE_ID_NETMOS_9900)) {
+                /* two possibilities: 0x30ps encodes number of parallel and
+                 * serial ports, or 0x1000 indicates *something*. This is not
+                 * immediately obvious, since the 2s1p+4s configuration seems
+                 * to offer all functionality on functions 0..2, while still
+                 * advertising the same function 3 as the 4s+2s1p config.
+                 */
+                sub_serports = dev->subsystem_device & 0xf;
+                if (sub_serports > 0) {
+                        return sub_serports;
+                } else {
+                        printk(KERN_NOTICE "NetMos/Mostech serial driver ignoring port on ambiguous config.\n");
+                        return 0;
+                }
+        }
+
+        moan_device("unknown NetMos/Mostech program interface", dev);
+        return 0;
+}
 
 static int pci_netmos_init(struct pci_dev *dev)
 {
@@ -761,12 +843,28 @@ static int pci_netmos_init(struct pci_dev *dev)
         if ((dev->device == PCI_DEVICE_ID_NETMOS_9901) ||
                 (dev->device == PCI_DEVICE_ID_NETMOS_9865))
                 return 0;
+
         if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
                         dev->subsystem_device == 0x0299)
                 return 0;
 
+        switch (dev->device) { /* FALLTHROUGH on all */
+                case PCI_DEVICE_ID_NETMOS_9904:
+                case PCI_DEVICE_ID_NETMOS_9912:
+                case PCI_DEVICE_ID_NETMOS_9922:
+                case PCI_DEVICE_ID_NETMOS_9900:
+                        num_serial = pci_netmos_9900_numports(dev);
+                        break;
+
+                default:
+                        if (num_serial == 0 ) {
+                                moan_device("unknown NetMos/Mostech device", dev);
+                        }
+        }
+
         if (num_serial == 0)
                 return -ENODEV;
+
         return num_serial;
 }
 
@@ -1396,6 +1494,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .device         = PCI_DEVICE_ID_TIMEDIA_1889,
                 .subvendor      = PCI_VENDOR_ID_TIMEDIA,
                 .subdevice      = PCI_ANY_ID,
+                .probe          = pci_timedia_probe,
                 .init           = pci_timedia_init,
                 .setup          = pci_timedia_setup,
         },
@@ -1426,7 +1525,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .subvendor      = PCI_ANY_ID,
                 .subdevice      = PCI_ANY_ID,
                 .init           = pci_netmos_init,
-                .setup          = pci_default_setup,
+                .setup          = pci_netmos_9900_setup,
         },
         /*
          * For Oxford Semiconductor Tornado based devices
@@ -1703,6 +1802,7 @@ enum pci_board_num_t {
         pbn_ADDIDATA_PCIe_8_3906250,
         pbn_ce4100_1_115200,
         pbn_omegapci,
+        pbn_NETMOS9900_2s_115200,
 };
 
 /*
@@ -2404,6 +2504,11 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 0x200,
         },
+        [pbn_NETMOS9900_2s_115200] = {
+                .flags          = FL_BASE0,
+                .num_ports      = 2,
+                .base_baud      = 115200,
+        },
 };
 
 static const struct pci_device_id softmodem_blacklist[] = {
@@ -2640,11 +2745,19 @@ EXPORT_SYMBOL_GPL(pciserial_resume_ports);
 static int __devinit
 pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 {
+        struct pci_serial_quirk *quirk;
         struct serial_private *priv;
         const struct pciserial_board *board;
         struct pciserial_board tmp;
         int rc;
 
+        quirk = find_quirk(dev);
+        if (quirk->probe) {
+                rc = quirk->probe(dev);
+                if (rc)
+                        return rc;
+        }
+
         if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
                 printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",
                         ent->driver_data);
@@ -2654,6 +2767,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;
 
@@ -3885,6 +3999,27 @@ static struct pci_device_id serial_pci_tbl[] = {
                 0xA000, 0x1000,
                 0, 0, pbn_b0_1_115200 },
 
+        /* the 9901 is a rebranded 9912 */
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9912,
+                0xA000, 0x1000,
+                0, 0, pbn_b0_1_115200 },
+
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9922,
+                0xA000, 0x1000,
+                0, 0, pbn_b0_1_115200 },
+
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9904,
+                0xA000, 0x1000,
+                0, 0, pbn_b0_1_115200 },
+
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
+                0xA000, 0x1000,
+                0, 0, pbn_b0_1_115200 },
+
+        {       PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,
+                0xA000, 0x3002,
+                0, 0, pbn_NETMOS9900_2s_115200 },
+
         /*
          * Best Connectivity PCI Multi I/O cards
          */
@@ -3927,6 +4062,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,
@@ -3936,6 +4116,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)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 8f41e1123461..cb40b82daf36 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1404,7 +1404,7 @@ config SERIAL_SC26XX
 
 config SERIAL_SC26XX_CONSOLE
         bool "Console on SC2681/SC2692 serial port"
-        depends on SERIAL_SC26XX
+        depends on SERIAL_SC26XX=y
         select SERIAL_CORE_CONSOLE
         help
           Support for Console on SC2681/SC2692 serial ports.
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 465210930890..846dfcd3ce0d 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -14,6 +14,7 @@
  *along with this program; if not, write to the Free Software
  *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <linux/kernel.h>
 #include <linux/serial_reg.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -44,6 +45,7 @@ enum {
 /* Set the max number of UART port
  * Intel EG20T PCH: 4 port
  * OKI SEMICONDUCTOR ML7213 IOH: 3 port
+ * OKI SEMICONDUCTOR ML7223 IOH: 2 port
 */
 #define PCH_UART_NR     4
 
@@ -137,8 +139,6 @@ enum {
 #define PCH_UART_DLL            0x00
 #define PCH_UART_DLM            0x01
 
-#define DIV_ROUND(a, b) (((a) + ((b)/2)) / (b))
-
 #define PCH_UART_IID_RLS        (PCH_UART_IIR_REI)
 #define PCH_UART_IID_RDR        (PCH_UART_IIR_RRI)
 #define PCH_UART_IID_RDR_TO     (PCH_UART_IIR_RRI | PCH_UART_IIR_TOI)
@@ -316,7 +316,7 @@ static int pch_uart_hal_set_line(struct eg20t_port *priv, int baud,
         unsigned int dll, dlm, lcr;
         int div;
 
-        div = DIV_ROUND(priv->base_baud / 16, baud);
+        div = DIV_ROUND_CLOSEST(priv->base_baud / 16, baud);
         if (div < 0 || USHRT_MAX <= div) {
                 dev_err(priv->port.dev, "Invalid Baud(div=0x%x)\n", div);
                 return -EINVAL;
@@ -1429,6 +1429,8 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
                 goto init_port_hal_free;
         }
 
+        pci_enable_msi(pdev);
+
         iobase = pci_resource_start(pdev, 0);
         mapbase = pci_resource_start(pdev, 1);
         priv->mapbase = mapbase;
@@ -1485,6 +1487,8 @@ static void pch_uart_pci_remove(struct pci_dev *pdev)
         struct eg20t_port *priv;
 
         priv = (struct eg20t_port *)pci_get_drvdata(pdev);
+
+        pci_disable_msi(pdev);
         pch_uart_exit_port(priv);
         pci_disable_device(pdev);
         kfree(priv);
@@ -1568,6 +1572,7 @@ static int __devinit pch_uart_pci_probe(struct pci_dev *pdev,
         return ret;
 
 probe_disable_device:
+        pci_disable_msi(pdev);
         pci_disable_device(pdev);
 probe_error:
         return ret;
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
index 8dd160c96e87..8b0b888a1b76 100644
--- a/drivers/tty/serial/s5pv210.c
+++ b/drivers/tty/serial/s5pv210.c
@@ -18,6 +18,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/delay.h>
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
@@ -83,6 +84,9 @@ static int s5pv210_serial_resetport(struct uart_port *port,
         wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
         wr_regl(port, S3C2410_UFCON, cfg->ufcon);
 
+        /* It is need to delay When reset FIFO register */
+        udelay(1);
+
         return 0;
 }
 
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 7ead42104c67..afc629423152 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1194,12 +1194,10 @@ int __devexit s3c24xx_serial_remove(struct platform_device *dev)
 EXPORT_SYMBOL_GPL(s3c24xx_serial_remove);
 
 /* UART power management code */
-
-#ifdef CONFIG_PM
-
-static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int s3c24xx_serial_suspend(struct device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
+        struct uart_port *port = s3c24xx_dev_to_port(dev);
 
         if (port)
                 uart_suspend_port(&s3c24xx_uart_drv, port);
@@ -1207,9 +1205,9 @@ static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t stat
         return 0;
 }
 
-static int s3c24xx_serial_resume(struct platform_device *dev)
+static int s3c24xx_serial_resume(struct device *dev)
 {
-        struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
+        struct uart_port *port = s3c24xx_dev_to_port(dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
         if (port) {
@@ -1222,17 +1220,20 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
 
         return 0;
 }
-#endif
+
+static const struct dev_pm_ops s3c24xx_serial_pm_ops = {
+        .suspend = s3c24xx_serial_suspend,
+        .resume = s3c24xx_serial_resume,
+};
+#else /* !CONFIG_PM_SLEEP */
+#define s3c24xx_serial_pm_ops   NULL
+#endif /* CONFIG_PM_SLEEP */
 
 int s3c24xx_serial_init(struct platform_driver *drv,
                         struct s3c24xx_uart_info *info)
 {
         dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-
-#ifdef CONFIG_PM
-        drv->suspend = s3c24xx_serial_suspend;
-        drv->resume = s3c24xx_serial_resume;
-#endif
+        drv->driver.pm = &s3c24xx_serial_pm_ops;
 
         return platform_driver_register(drv);
 }