Merge branch 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

* 'kdb-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb: (25 commits)
  kdb,debug_core: Allow the debug core to receive a panic notification
  MAINTAINERS: update kgdb, kdb, and debug_core info
  debug_core,kdb: Allow the debug core to process a recursive debug entry
  printk,kdb: capture printk() when in kdb shell
  kgdboc,kdb: Allow kdb to work on a non open console port
  kgdb: Add the ability to schedule a breakpoint via a tasklet
  mips,kgdb: kdb low level trap catch and stack trace
  powerpc,kgdb: Introduce low level trap catching
  x86,kgdb: Add low level debug hook
  kgdb: remove post_primary_code references
  kgdb,docs: Update the kgdb docs to include kdb
  kgdboc,keyboard: Keyboard driver for kdb with kgdb
  kgdb: gdb "monitor" -> kdb passthrough
  sparc,sunzilog: Add console polling support for sunzilog serial driver
  sh,sh-sci: Use NO_POLL_CHAR in the SCIF polled console code
  kgdb,8250,pl011: Return immediately from console poll
  kgdb: core changes to support kdb
  kdb: core for kgdb back end (2 of 2)
  kdb: core for kgdb back end (1 of 2)
  kgdb,blackfin: Add in kgdb_arch_set_pc for blackfin
  ...

1 files changed, 50 insertions, 0 deletions

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 2c7a66af4f52..978b3cee02d7 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -102,6 +102,8 @@ struct uart_sunzilog_port {
 #endif
 };
 
+static void sunzilog_putchar(struct uart_port *port, int ch);
+
 #define ZILOG_CHANNEL_FROM_PORT(PORT)   ((struct zilog_channel __iomem *)((PORT)->membase))
 #define UART_ZILOG(PORT)                ((struct uart_sunzilog_port *)(PORT))
 
@@ -996,6 +998,50 @@ static int sunzilog_verify_port(struct uart_port *port, struct serial_struct *se
         return -EINVAL;
 }
 
+#ifdef CONFIG_CONSOLE_POLL
+static int sunzilog_get_poll_char(struct uart_port *port)
+{
+        unsigned char ch, r1;
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
+        struct zilog_channel __iomem *channel
+                = ZILOG_CHANNEL_FROM_PORT(&up->port);
+
+
+        r1 = read_zsreg(channel, R1);
+        if (r1 & (PAR_ERR | Rx_OVR | CRC_ERR)) {
+                writeb(ERR_RES, &channel->control);
+                ZSDELAY();
+                ZS_WSYNC(channel);
+        }
+
+        ch = readb(&channel->control);
+        ZSDELAY();
+
+        /* This funny hack depends upon BRK_ABRT not interfering
+         * with the other bits we care about in R1.
+         */
+        if (ch & BRK_ABRT)
+                r1 |= BRK_ABRT;
+
+        if (!(ch & Rx_CH_AV))
+                return NO_POLL_CHAR;
+
+        ch = readb(&channel->data);
+        ZSDELAY();
+
+        ch &= up->parity_mask;
+        return ch;
+}
+
+static void sunzilog_put_poll_char(struct uart_port *port,
+                        unsigned char ch)
+{
+        struct uart_sunzilog_port *up = (struct uart_sunzilog_port *)port;
+
+        sunzilog_putchar(&up->port, ch);
+}
+#endif /* CONFIG_CONSOLE_POLL */
+
 static struct uart_ops sunzilog_pops = {
         .tx_empty       =       sunzilog_tx_empty,
         .set_mctrl      =       sunzilog_set_mctrl,
@@ -1013,6 +1059,10 @@ static struct uart_ops sunzilog_pops = {
         .request_port   =       sunzilog_request_port,
         .config_port    =       sunzilog_config_port,
         .verify_port    =       sunzilog_verify_port,
+#ifdef CONFIG_CONSOLE_POLL
+        .poll_get_char  =       sunzilog_get_poll_char,
+        .poll_put_char  =       sunzilog_put_poll_char,
+#endif
 };
 
 static int uart_chip_count;