Merge /spare/repo/linux-2.6/

10 files changed, 124 insertions, 43 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 30a0a3d10145..4d75cdfa0a0a 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -864,7 +864,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
         /*
          * We're pretty sure there's a port here.  Lets find out what
          * type of port it is.  The IIR top two bits allows us to find
-         * out if its 8250 or 16450, 16550, 16550A or later.  This
+         * out if it's 8250 or 16450, 16550, 16550A or later.  This
          * determines what we test for next.
          *
          * We also initialise the EFR (if any) to zero for later.  The
@@ -2536,7 +2536,7 @@ static int __init serial8250_init(void)
                 goto out;
 
         serial8250_isa_devs = platform_device_register_simple("serial8250",
-                                                              -1, NULL, 0);
+                                         PLAT8250_DEV_LEGACY, NULL, 0);
         if (IS_ERR(serial8250_isa_devs)) {
                 ret = PTR_ERR(serial8250_isa_devs);
                 goto unreg;
diff --git a/drivers/serial/8250_accent.c b/drivers/serial/8250_accent.c
index 1f2c276063ef..9c10262f2469 100644
--- a/drivers/serial/8250_accent.c
+++ b/drivers/serial/8250_accent.c
@@ -29,7 +29,7 @@ static struct plat_serial8250_port accent_data[] = {
 
 static struct platform_device accent_device = {
         .name                   = "serial8250",
-        .id                     = 2,
+        .id                     = PLAT8250_DEV_ACCENT,
         .dev                    = {
                 .platform_data  = accent_data,
         },
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
index 6b9ead288517..a802bdce6e5d 100644
--- a/drivers/serial/8250_acpi.c
+++ b/drivers/serial/8250_acpi.c
@@ -47,18 +47,30 @@ static acpi_status acpi_serial_port(struct uart_port *port,
 static acpi_status acpi_serial_ext_irq(struct uart_port *port,
                                        struct acpi_resource_ext_irq *ext_irq)
 {
-        if (ext_irq->number_of_interrupts > 0)
-                port->irq = acpi_register_gsi(ext_irq->interrupts[0],
+        int rc;
+
+        if (ext_irq->number_of_interrupts > 0) {
+                rc = acpi_register_gsi(ext_irq->interrupts[0],
                            ext_irq->edge_level, ext_irq->active_high_low);
+                if (rc < 0)
+                        return AE_ERROR;
+                port->irq = rc;
+        }
         return AE_OK;
 }
 
 static acpi_status acpi_serial_irq(struct uart_port *port,
                                    struct acpi_resource_irq *irq)
 {
-        if (irq->number_of_interrupts > 0)
-                port->irq = acpi_register_gsi(irq->interrupts[0],
+        int rc;
+
+        if (irq->number_of_interrupts > 0) {
+                rc = acpi_register_gsi(irq->interrupts[0],
                            irq->edge_level, irq->active_high_low);
+                if (rc < 0)
+                        return AE_ERROR;
+                port->irq = rc;
+        }
         return AE_OK;
 }
 
diff --git a/drivers/serial/8250_boca.c b/drivers/serial/8250_boca.c
index 465c9ea1e7a3..3bfe0f7b26fb 100644
--- a/drivers/serial/8250_boca.c
+++ b/drivers/serial/8250_boca.c
@@ -43,7 +43,7 @@ static struct plat_serial8250_port boca_data[] = {
 
 static struct platform_device boca_device = {
         .name                   = "serial8250",
-        .id                     = 3,
+        .id                     = PLAT8250_DEV_BOCA,
         .dev                    = {
                 .platform_data  = boca_data,
         },
diff --git a/drivers/serial/8250_fourport.c b/drivers/serial/8250_fourport.c
index e9b4d908ef42..6375d68b7913 100644
--- a/drivers/serial/8250_fourport.c
+++ b/drivers/serial/8250_fourport.c
@@ -35,7 +35,7 @@ static struct plat_serial8250_port fourport_data[] = {
 
 static struct platform_device fourport_device = {
         .name                   = "serial8250",
-        .id                     = 1,
+        .id                     = PLAT8250_DEV_FOURPORT,
         .dev                    = {
                 .platform_data  = fourport_data,
         },
diff --git a/drivers/serial/8250_hub6.c b/drivers/serial/8250_hub6.c
index 77f396f84b4c..daf569cd3c8f 100644
--- a/drivers/serial/8250_hub6.c
+++ b/drivers/serial/8250_hub6.c
@@ -40,7 +40,7 @@ static struct plat_serial8250_port hub6_data[] = {
 
 static struct platform_device hub6_device = {
         .name                   = "serial8250",
-        .id                     = 4,
+        .id                     = PLAT8250_DEV_HUB6,
         .dev                    = {
                 .platform_data  = hub6_data,
         },
diff --git a/drivers/serial/8250_mca.c b/drivers/serial/8250_mca.c
index f0c40d68b8c1..ac205256d5f3 100644
--- a/drivers/serial/8250_mca.c
+++ b/drivers/serial/8250_mca.c
@@ -44,7 +44,7 @@ static struct plat_serial8250_port mca_data[] = {
 
 static struct platform_device mca_device = {
         .name                   = "serial8250",
-        .id                     = 5,
+        .id                     = PLAT8250_DEV_MCA,
         .dev                    = {
                 .platform_data  = mca_data,
         },
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index e39818a34a07..b745a1b9e835 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -80,7 +80,7 @@ config SERIAL_8250_CS
 config SERIAL_8250_ACPI
         bool "8250/16550 device discovery via ACPI namespace"
         default y if IA64
-        depends on ACPI_BUS && SERIAL_8250
+        depends on ACPI && SERIAL_8250
         ---help---
           If you wish to enable serial port discovery via the ACPI
           namespace, say Y here.  If unsure, say N.
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 43b03c55f453..e2ebdcad553c 100644
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -63,8 +63,13 @@ struct timer_list mcfrs_timer_struct;
 #endif
 
 #if defined(CONFIG_HW_FEITH)
-  #define       CONSOLE_BAUD_RATE       38400
-  #define       DEFAULT_CBAUD           B38400
+#define CONSOLE_BAUD_RATE       38400
+#define DEFAULT_CBAUD           B38400
+#endif
+
+#if defined(CONFIG_MOD5272)
+#define CONSOLE_BAUD_RATE       115200
+#define DEFAULT_CBAUD           B115200
 #endif
 
 #ifndef CONSOLE_BAUD_RATE
@@ -90,7 +95,7 @@ static struct tty_driver *mcfrs_serial_driver;
 #undef SERIAL_DEBUG_OPEN
 #undef SERIAL_DEBUG_FLOW
 
-#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
 #define IRQBASE (MCFINT_VECBASE+MCFINT_UART0)
 #else
 #define IRQBASE 73
@@ -1510,7 +1515,7 @@ static void mcfrs_irqinit(struct mcf_serial *info)
         *portp = (*portp & ~0x000000ff) | 0x00000055;
         portp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PDCNT);
         *portp = (*portp & ~0x000003fc) | 0x000002a8;
-#elif defined(CONFIG_M527x) || defined(CONFIG_M528x)
+#elif defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
         volatile unsigned char *icrp, *uartp;
         volatile unsigned long *imrp;
 
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 49afadbe461b..f10c86d60b64 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -31,6 +31,8 @@
  *      1.01    Set fifosize to make tx_empry called properly.
  *              Use standard uart_get_divisor.
  *      1.02    Cleanup. (import 8250.c changes)
+ *      1.03    Fix low-latency mode. (import 8250.c changes)
+ *      1.04    Remove usage of deprecated functions, cleanup.
  */
 #include <linux/config.h>
 
@@ -54,7 +56,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-static char *serial_version = "1.02";
+static char *serial_version = "1.04";
 static char *serial_name = "TX39/49 Serial driver";
 
 #define PASS_LIMIT      256
@@ -86,9 +88,9 @@ static char *serial_name = "TX39/49 Serial driver";
  */
 #ifdef ENABLE_SERIAL_TXX9_PCI
 #define NR_PCI_BOARDS   4
-#define UART_NR  (2 + NR_PCI_BOARDS)
+#define UART_NR  (4 + NR_PCI_BOARDS)
 #else
-#define UART_NR  2
+#define UART_NR  4
 #endif
 
 struct uart_txx9_port {
@@ -304,8 +306,11 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r
                 /* The following is not allowed by the tty layer and
                    unsafe. It should be fixed ASAP */
                 if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
-                        if(tty->low_latency)
+                        if (tty->low_latency) {
+                                spin_unlock(&up->port.lock);
                                 tty_flip_buffer_push(tty);
+                                spin_lock(&up->port.lock);
+                        }
                         /* If this failed then we will throw away the
                            bytes but must do so to clear interrupts */
                 }
@@ -356,7 +361,9 @@ receive_chars(struct uart_txx9_port *up, unsigned int *status, struct pt_regs *r
         ignore_char:
                 disr = sio_in(up, TXX9_SIDISR);
         } while (!(disr & TXX9_SIDISR_UVALID) && (max_count-- > 0));
+        spin_unlock(&up->port.lock);
         tty_flip_buffer_push(tty);
+        spin_lock(&up->port.lock);
         *status = disr;
 }
 
@@ -667,17 +674,8 @@ serial_txx9_pm(struct uart_port *port, unsigned int state,
               unsigned int oldstate)
 {
         struct uart_txx9_port *up = (struct uart_txx9_port *)port;
-        if (state) {
-                /* sleep */
-
-                if (up->pm)
-                        up->pm(port, state, oldstate);
-        } else {
-                /* wake */
-
-                if (up->pm)
-                        up->pm(port, state, oldstate);
-        }
+        if (up->pm)
+                up->pm(port, state, oldstate);
 }
 
 static int serial_txx9_request_resource(struct uart_txx9_port *up)
@@ -979,14 +977,6 @@ static int __init serial_txx9_console_init(void)
 }
 console_initcall(serial_txx9_console_init);
 
-static int __init serial_txx9_late_console_init(void)
-{
-        if (!(serial_txx9_console.flags & CON_ENABLED))
-                register_console(&serial_txx9_console);
-        return 0;
-}
-late_initcall(serial_txx9_late_console_init);
-
 #define SERIAL_TXX9_CONSOLE     &serial_txx9_console
 #else
 #define SERIAL_TXX9_CONSOLE     NULL
@@ -1039,6 +1029,73 @@ static void serial_txx9_resume_port(int line)
         uart_resume_port(&serial_txx9_reg, &serial_txx9_ports[line].port);
 }
 
+static DECLARE_MUTEX(serial_txx9_sem);
+
+/**
+ *      serial_txx9_register_port - register a serial port
+ *      @port: serial port template
+ *
+ *      Configure the serial port specified by the request.
+ *
+ *      The port is then probed and if necessary the IRQ is autodetected
+ *      If this fails an error is returned.
+ *
+ *      On success the port is ready to use and the line number is returned.
+ */
+static int __devinit serial_txx9_register_port(struct uart_port *port)
+{
+        int i;
+        struct uart_txx9_port *uart;
+        int ret = -ENOSPC;
+
+        down(&serial_txx9_sem);
+        for (i = 0; i < UART_NR; i++) {
+                uart = &serial_txx9_ports[i];
+                if (uart->port.type == PORT_UNKNOWN)
+                        break;
+        }
+        if (i < UART_NR) {
+                uart_remove_one_port(&serial_txx9_reg, &uart->port);
+                uart->port.iobase = port->iobase;
+                uart->port.membase = port->membase;
+                uart->port.irq      = port->irq;
+                uart->port.uartclk  = port->uartclk;
+                uart->port.iotype   = port->iotype;
+                uart->port.flags    = port->flags | UPF_BOOT_AUTOCONF;
+                uart->port.mapbase  = port->mapbase;
+                if (port->dev)
+                        uart->port.dev = port->dev;
+                ret = uart_add_one_port(&serial_txx9_reg, &uart->port);
+                if (ret == 0)
+                        ret = uart->port.line;
+        }
+        up(&serial_txx9_sem);
+        return ret;
+}
+
+/**
+ *      serial_txx9_unregister_port - remove a txx9 serial port at runtime
+ *      @line: serial line number
+ *
+ *      Remove one serial port.  This may not be called from interrupt
+ *      context.  We hand the port back to the our control.
+ */
+static void __devexit serial_txx9_unregister_port(int line)
+{
+        struct uart_txx9_port *uart = &serial_txx9_ports[line];
+
+        down(&serial_txx9_sem);
+        uart_remove_one_port(&serial_txx9_reg, &uart->port);
+        uart->port.flags = 0;
+        uart->port.type = PORT_UNKNOWN;
+        uart->port.iobase = 0;
+        uart->port.mapbase = 0;
+        uart->port.membase = 0;
+        uart->port.dev = NULL;
+        uart_add_one_port(&serial_txx9_reg, &uart->port);
+        up(&serial_txx9_sem);
+}
+
 /*
  * Probe one serial board.  Unfortunately, there is no rhyme nor reason
  * to the arrangement of serial ports on a PCI card.
@@ -1056,13 +1113,13 @@ pciserial_txx9_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 
         memset(&port, 0, sizeof(port));
         port.ops = &serial_txx9_pops;
-        port.flags |= UPF_BOOT_AUTOCONF; /* uart_ops.config_port will be called */
         port.flags |= UPF_TXX9_HAVE_CTS_LINE;
         port.uartclk = 66670000;
         port.irq = dev->irq;
         port.iotype = UPIO_PORT;
         port.iobase = pci_resource_start(dev, 1);
-        line = uart_register_port(&serial_txx9_reg, &port);
+        port.dev = &dev->dev;
+        line = serial_txx9_register_port(&port);
         if (line < 0) {
                 printk(KERN_WARNING "Couldn't register serial port %s: %d\n", pci_name(dev), line);
         }
@@ -1078,7 +1135,7 @@ static void __devexit pciserial_txx9_remove_one(struct pci_dev *dev)
         pci_set_drvdata(dev, NULL);
 
         if (line) {
-                uart_unregister_port(&serial_txx9_reg, line);
+                serial_txx9_unregister_port(line);
                 pci_disable_device(dev);
         }
 }
@@ -1089,6 +1146,8 @@ static int pciserial_txx9_suspend_one(struct pci_dev *dev, pm_message_t state)
 
         if (line)
                 serial_txx9_suspend_port(line);
+        pci_save_state(dev);
+        pci_set_power_state(dev, pci_choose_state(dev, state));
         return 0;
 }
 
@@ -1096,8 +1155,13 @@ static int pciserial_txx9_resume_one(struct pci_dev *dev)
 {
         int line = (int)(long)pci_get_drvdata(dev);
 
-        if (line)
+        pci_set_power_state(dev, PCI_D0);
+        pci_restore_state(dev);
+
+        if (line) {
+                pci_enable_device(dev);
                 serial_txx9_resume_port(line);
+        }
         return 0;
 }