Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b41dbc1 authored by Cosmin Cojocar's avatar Cosmin Cojocar Committed by Greg Kroah-Hartman
Browse files

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.

Signed-off-by: default avatarCosmin Cojocar <cosmin.cojocar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ac387d9

drivers/serial/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o 
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o

obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o

obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o

obj-$(CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL) += nwpserial.o

obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o

obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o

obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o

obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o

obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o

obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o

obj-$(CONFIG_SERIAL_TIMBERDALE)	+= timbuart.o
@@ -89,6 +90,5 @@ obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o 
obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o

obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o

obj-$(CONFIG_SERIAL_MRST_MAX3110)	+= mrst_max3110.o

obj-$(CONFIG_SERIAL_MRST_MAX3110)	+= mrst_max3110.o

obj-$(CONFIG_SERIAL_MFD_HSU)	+= mfd.o

obj-$(CONFIG_SERIAL_MFD_HSU)	+= mfd.o

obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o

obj-$(CONFIG_SERIAL_IFX6X60)  	+= ifx6x60.o

obj-$(CONFIG_SERIAL_IFX6X60)  	+= ifx6x60.o

obj-$(CONFIG_SERIAL_PCH_UART)	+= pch_uart.o
 
obj-$(CONFIG_SERIAL_PCH_UART)	+= pch_uart.o

drivers/serial/omap-serial.c

+32 −6
Original line number Original line Diff line number Diff line
@@ -866,12 +866,6 @@ serial_omap_type(struct uart_port *port) 
	return up->name;

	return up->name;

}

}





#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)

#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)





static inline void wait_for_xmitr(struct uart_omap_port *up)

static inline void wait_for_xmitr(struct uart_omap_port *up)
@@ -905,6 +899,34 @@ static inline void wait_for_xmitr(struct uart_omap_port *up) 
	}

	}

}

}





#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;

	wait_for_xmitr(up);

	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 = serial_in(up, UART_LSR);



	if (!(status & UART_LSR_DR))

		return NO_POLL_CHAR;



	return serial_in(up, UART_RX);

}



#endif /* CONFIG_CONSOLE_POLL */



#ifdef CONFIG_SERIAL_OMAP_CONSOLE



static struct uart_omap_port *serial_omap_console_ports[4];



static struct uart_driver serial_omap_reg;



static void serial_omap_console_putchar(struct uart_port *port, int ch)

static void serial_omap_console_putchar(struct uart_port *port, int ch)

{

{

	struct uart_omap_port *up = (struct uart_omap_port *)port;

	struct uart_omap_port *up = (struct uart_omap_port *)port;
@@ -1022,6 +1044,10 @@ static struct uart_ops serial_omap_pops = { 
	.request_port	= serial_omap_request_port,

	.request_port	= serial_omap_request_port,

	.config_port	= serial_omap_config_port,

	.config_port	= serial_omap_config_port,

	.verify_port	= serial_omap_verify_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 = {

static struct uart_driver serial_omap_reg = {