* [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
@ 2010-11-22 23:24 Cosmin Cojocar
2010-11-23 0:10 ` Greg KH
2010-12-01 1:28 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Cosmin Cojocar @ 2010-11-22 23:24 UTC (permalink / raw)
To: govindraj.raja
Cc: manjugk, khilman, tony, ben-linux, tklauser, feng.tang, alan,
gregkh, linux-omap, Cosmin Cojocar
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: Cosmin Cojocar <cosmin.cojocar@gmail.com>
---
drivers/serial/Makefile | 2 +-
drivers/serial/omap-serial.c | 38 ++++++++++++++++++++++++++++++++------
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index c570576..ad86113 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -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
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c
index 03a96db..552759e 100644
--- a/drivers/serial/omap-serial.c
+++ b/drivers/serial/omap-serial.c
@@ -866,12 +866,6 @@ serial_omap_type(struct uart_port *port)
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)
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)
{
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,
.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 = {
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
2010-11-22 23:24 [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger Cosmin Cojocar
@ 2010-11-23 0:10 ` Greg KH
2010-11-23 0:18 ` Cosmin Cojocar
2010-12-01 1:28 ` Greg KH
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2010-11-23 0:10 UTC (permalink / raw)
To: Cosmin Cojocar
Cc: govindraj.raja, manjugk, khilman, tony, ben-linux, tklauser,
feng.tang, alan, gregkh, linux-omap
On Tue, Nov 23, 2010 at 12:24:12AM +0100, Cosmin Cojocar wrote:
> 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.
What was the difference between v2 and v3?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
2010-11-23 0:10 ` Greg KH
@ 2010-11-23 0:18 ` Cosmin Cojocar
2010-11-23 0:26 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Cosmin Cojocar @ 2010-11-23 0:18 UTC (permalink / raw)
To: Greg KH
Cc: govindraj.raja, manjugk, khilman, tony, ben-linux, tklauser,
feng.tang, alan, gregkh, linux-omap
The v2 was a intermediate testing version which I sent it out by
mistake. The difference between the tow is that the v2 uses a
infinite loop to wait for data to be transfered out form buffer, whereas
the v3 relies on existing wait_form_xmitr function.
Regards,
Cosmin
Greg KH wrote:
> On Tue, Nov 23, 2010 at 12:24:12AM +0100, Cosmin Cojocar wrote:
>> 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.
>
> What was the difference between v2 and v3?
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
2010-11-23 0:18 ` Cosmin Cojocar
@ 2010-11-23 0:26 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2010-11-23 0:26 UTC (permalink / raw)
To: Cosmin Cojocar
Cc: govindraj.raja, manjugk, khilman, tony, ben-linux, tklauser,
feng.tang, alan, gregkh, linux-omap
A: No.
Q: Should I include quotations after my reply?
http://daringfireball.net/2007/07/on_top
On Tue, Nov 23, 2010 at 01:18:51AM +0100, Cosmin Cojocar wrote:
> The v2 was a intermediate testing version which I sent it out by
> mistake. The difference between the tow is that the v2 uses a
> infinite loop to wait for data to be transfered out form buffer, whereas
> the v3 relies on existing wait_form_xmitr function.
In the future, please say this in the comment section in the patch (i.e.
below the "---" line.)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
2010-11-22 23:24 [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger Cosmin Cojocar
2010-11-23 0:10 ` Greg KH
@ 2010-12-01 1:28 ` Greg KH
2010-12-05 15:15 ` Cosmin Cojocar
1 sibling, 1 reply; 6+ messages in thread
From: Greg KH @ 2010-12-01 1:28 UTC (permalink / raw)
To: Cosmin Cojocar
Cc: govindraj.raja, manjugk, khilman, tony, ben-linux, tklauser,
feng.tang, alan, gregkh, linux-omap
On Tue, Nov 23, 2010 at 12:24:12AM +0100, Cosmin Cojocar wrote:
> 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: Cosmin Cojocar <cosmin.cojocar@gmail.com>
> ---
> drivers/serial/Makefile | 2 +-
This fails to apply to the linux-next tree due to Makefile changes in
this area. Can you rediff it and resend it to me so that I can apply
it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger
2010-12-01 1:28 ` Greg KH
@ 2010-12-05 15:15 ` Cosmin Cojocar
0 siblings, 0 replies; 6+ messages in thread
From: Cosmin Cojocar @ 2010-12-05 15:15 UTC (permalink / raw)
To: gregkh
Cc: govindraj.raja, manjugk, khilman, tony, ben-linux, tklauser,
feng.tang, alan, linux-omap, Cosmin Cojocar
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: Cosmin Cojocar <cosmin.cojocar@gmail.com>
---
I fixed the conflicts from Makefile when applying it to the linux-next
tree. This patch is against the linux-next tree.
drivers/serial/Makefile | 2 +-
drivers/serial/omap-serial.c | 38 ++++++++++++++++++++++++++++++++------
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index f9b26df..8ea92e9 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -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
@@ -89,6 +90,5 @@ obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
obj-$(CONFIG_SERIAL_VT8500) += vt8500_serial.o
obj-$(CONFIG_SERIAL_MRST_MAX3110) += mrst_max3110.o
obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o
-obj-$(CONFIG_SERIAL_OMAP) += omap-serial.o
obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x60.o
obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c
index 1201eff..7f2f010 100644
--- a/drivers/serial/omap-serial.c
+++ b/drivers/serial/omap-serial.c
@@ -866,12 +866,6 @@ serial_omap_type(struct uart_port *port)
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)
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)
{
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,
.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 = {
--
1.6.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-05 15:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-22 23:24 [PATCH v3 1/1] serial: omap-serial: Add support for kernel debugger Cosmin Cojocar
2010-11-23 0:10 ` Greg KH
2010-11-23 0:18 ` Cosmin Cojocar
2010-11-23 0:26 ` Greg KH
2010-12-01 1:28 ` Greg KH
2010-12-05 15:15 ` Cosmin Cojocar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.