serial: omap-serial: Add support for kernel debugger
PATCH 1/1 serial: omap-serial: Add support for kernel debugger
The kgdb invokes the poll_put_char and poll_get_char when communicating with the host. This patch also changes the initialization order because the kgdb will check at the very beginning, if there is a valid serial driver.
--- drivers/serial/Makefile | 2 +- drivers/serial/omap-serial.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)
drivers/serial/Makefile +1 -1
@@ -80,6 +80,7 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o +obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
@@ -88,4 +89,3 @@ obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o obj-$(CONFIG_SERIAL_MRST_MAX3110) += mrst_max3110.o obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o -obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
drivers/serial/omap-serial.c +36 -2
@@ -866,14 +866,44 @@ serial_omap_type(struct uart_port *port)return up->name; } +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +#ifdef CONFIG_CONSOLE_POLL +static void serial_omap_poll_put_char (struct uart_port *port,unsigned char ch) +{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); + +serial_out (up,UART_TX , ch); +} + +static int serial_omap_poll_get_char (struct uart_port *port) +{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; +int ch; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &UART_LSR_DR ) !=UART_LSR_DR ); + + ch = (int )serial_in (up,UART_RX ); +return ch; +} +#endif +#ifdef CONFIG_SERIAL_OMAP_CONSOLE static struct uart_omap_port *serial_omap_console_ports[4 ];static struct uart_driver serial_omap_reg; -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -static inline void wait_for_xmitr (struct uart_omap_port *up) {unsigned int status, tmout =10000 ;
@@ -1022,6 +1052,10 @@ static struct uart_ops serial_omap_pops = { .request_port = serial_omap_request_port, .config_port = serial_omap_config_port, .verify_port = serial_omap_verify_port, +#ifdef CONFIG_CONSOLE_POLL + .poll_put_char = serial_omap_poll_put_char, + .poll_get_char = serial_omap_poll_get_char, +#endif }; static struct uart_driver serial_omap_reg = {
Signature · 1 line
1.6.3.3
Hi Cosmin,
Quoted 39 lines · Cosmin Cojocar
The kgdb invokes the
poll_put_charandpoll_get_charwhen communicating with the host. This patch also changes the initialization order because the kgdb will check at the very beginning, if there is a valid serial driver.Signed-off-by Cosmin Cojocar <[email protected]>--- drivers/serial/Makefile | 2 +- drivers/serial/omap-serial.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)drivers/serial/Makefile +1
-1@@ -80,6 +80,7 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o +obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o@@ -88,4 +89,3 @@ obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o obj-$(CONFIG_SERIAL_MRST_MAX3110) += mrst_max3110.o obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o -obj-$(CONFIG_SERIAL_OMAP) += omap-serial.odrivers/serial/omap-serial.c +3
-0@@ -866,14 +866,44 @@ serial_omap_type(struct uart_port *port)return up->name; } +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +#ifdef CONFIG_CONSOLE_POLL
drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 881
Quoted 10 lines
drivers/serial/omap-serial.c +10
-0+static void serial_omap_poll_put_char (struct uart_port *port,unsigned char ch) +{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); +
Shouldn't you use wait_for_xmitr() instead? If you do that, then you don't need to move the BOTH_EMPTY macro anymore.
Quoted 4 lines
drivers/serial/omap-serial.c +4
-0+serial_out (up,UART_TX , ch); +} + +static int serial_omap_poll_get_char (struct uart_port *port)
drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 895
Quoted 10 lines
drivers/serial/omap-serial.c +10
-0+{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; +int ch; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &UART_LSR_DR ) !=UART_LSR_DR ); +
I think you should be returning NO_POLL_CHAR if the condition is false, instead of busy looping.
drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 898
Quoted 3 lines
drivers/serial/omap-serial.c +3
-0+ ch = (int )serial_in (up,UART_RX ); +return ch; +}
I don't think you need the extra ch variable. Just return serial_in(up, UART_RX).
Cheers,
Ionut.
Hi Ionut,
Quoted 39 lines · Ionut Nicu
Hi Cosmin,
Quoted 36 lines · Cosmin Cojocar
The kgdb invokes the
poll_put_charandpoll_get_charwhen communicating with the host. This patch also changes the initialization order because the kgdb will check at the very beginning, if there is a valid serial driver.Signed-off-by Cosmin Cojocar <[email protected]>--- drivers/serial/Makefile | 2 +- drivers/serial/omap-serial.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)drivers/serial/Makefile +1
-1@@ -80,6 +80,7 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o +obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o@@ -88,4 +89,3 @@ obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o obj-$(CONFIG_SERIAL_MRST_MAX3110) += mrst_max3110.o obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o -obj-$(CONFIG_SERIAL_OMAP) += omap-serial.odrivers/serial/omap-serial.c +0
-0@@ -866,14 +866,44 @@ serial_omap_type(struct uart_port *port)return up->name; }
Quoted 17 lines
drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 881
Quoted 13 lines
drivers/serial/omap-serial.c +13
-0+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +#ifdef CONFIG_CONSOLE_POLL +static void serial_omap_poll_put_char (struct uart_port *port,unsigned char ch) +{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); +Shouldn't you use
wait_for_xmitr()instead? If you do that, then you don't need to move theBOTH_EMPTYmacro anymore.
Initially, I had used the wait_for_xmitr, but the gdb couldn't establish a connection. I will retest it.
Quoted 18 lines
Quoted 4 lines
drivers/serial/omap-serial.c +4
-0+serial_out (up,UART_TX , ch); +} + +static int serial_omap_poll_get_char (struct uart_port *port)drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 895
Quoted 10 lines
drivers/serial/omap-serial.c +10
-0+{ +struct uart_omap_port *up = (struct uart_omap_port *)port; +unsigned int status; +int ch; + +do { + status =serial_in (up,UART_LSR ); +udelay (1 ); + }while ((status &UART_LSR_DR ) !=UART_LSR_DR ); +I think you should be returning
NO_POLL_CHARif the condition is false, instead of busy looping.
Quoted 7 lines
drivers/serial/omap-serial.c serial_omap_type(struct uart_port *port) · line 898
Quoted 3 lines
drivers/serial/omap-serial.c +3
-0+ ch = (int )serial_in (up,UART_RX ); +return ch; +}I don't think you need the extra ch variable. Just return
serial_in(up, UART_RX).
Here, I agree with your comments.
Quoted 4 lines
Cheers,
Ionut.
Regards,
Cosmin