From: Anton Vorontsov <anton.vorontsov@linaro.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Russell King <linux@arm.linux.org.uk>,
Jason Wessel <jason.wessel@windriver.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alan Cox <alan@linux.intel.com>
Cc: "Arve Hjønnevåg" <arve@android.com>,
"Colin Cross" <ccross@android.com>,
"Brian Swetland" <swetland@google.com>,
"John Stultz" <john.stultz@linaro.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linaro-kernel@lists.linaro.org, patches@linaro.org,
kernel-team@android.com, kgdb-bugreport@lists.sourceforge.net,
linux-serial@vger.kernel.org
Subject: [PATCH 06/14] tty/serial/core: Introduce poll_init callback
Date: Sun, 9 Sep 2012 21:13:35 -0700 [thread overview]
Message-ID: <20120910041335.GF29537@lizard> (raw)
In-Reply-To: <20120910040802.GA1261@lizard>
It was noticed that polling drivers (like KGDB) are not able to use
serial ports if the ports were not previously initialized via console.
I.e. when booting with console=ttyAMA0 kgdboc=ttyAMA0, everything works
fine, but with console=ttyFOO kgdboc=ttyAMA0, the kgdboc doesn't work.
This is because we don't initialize the hardware. Calling ->startup() is
not an option, because drivers request interrupts there, and drivers
fail to handle situations when tty isn't opened with interrupts enabled.
So, we have to implement a new callback (actually, tty_ops already have
a similar callback), which does everything needed to initialize just the
hardware.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
drivers/tty/serial/serial_core.c | 15 +++++++++++++++
include/linux/serial_core.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index a21dc8e..cba8443 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2108,11 +2108,13 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
{
struct uart_driver *drv = driver->driver_state;
struct uart_state *state = drv->state + line;
+ struct tty_port *tport;
struct uart_port *port;
int baud = 9600;
int bits = 8;
int parity = 'n';
int flow = 'n';
+ int ret;
if (!state || !state->uart_port)
return -1;
@@ -2121,6 +2123,19 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
if (!(port->ops->poll_get_char && port->ops->poll_put_char))
return -1;
+ tport = &state->port;
+ if (!(tport->flags & ASYNC_INITIALIZED) && port->ops->poll_init) {
+ mutex_lock(&tport->mutex);
+ ret = port->ops->poll_init(port);
+ /*
+ * We don't set ASYNCB_INITIALIZED as we only initialized the
+ * hw, e.g. state->xmit is still uninitialized.
+ */
+ mutex_unlock(&tport->mutex);
+ if (ret)
+ return ret;
+ }
+
if (options) {
uart_parse_options(options, &baud, &parity, &bits, &flow);
return uart_set_options(port, NULL, baud, parity, bits, flow);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 0253c20..3642710 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -274,6 +274,7 @@ struct uart_ops {
int (*verify_port)(struct uart_port *, struct serial_struct *);
int (*ioctl)(struct uart_port *, unsigned int, unsigned long);
#ifdef CONFIG_CONSOLE_POLL
+ int (*poll_init)(struct uart_port *);
void (*poll_put_char)(struct uart_port *, unsigned char);
int (*poll_get_char)(struct uart_port *);
#endif
--
1.7.11.5
WARNING: multiple messages have this Message-ID (diff)
From: anton.vorontsov@linaro.org (Anton Vorontsov)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/14] tty/serial/core: Introduce poll_init callback
Date: Sun, 9 Sep 2012 21:13:35 -0700 [thread overview]
Message-ID: <20120910041335.GF29537@lizard> (raw)
In-Reply-To: <20120910040802.GA1261@lizard>
It was noticed that polling drivers (like KGDB) are not able to use
serial ports if the ports were not previously initialized via console.
I.e. when booting with console=ttyAMA0 kgdboc=ttyAMA0, everything works
fine, but with console=ttyFOO kgdboc=ttyAMA0, the kgdboc doesn't work.
This is because we don't initialize the hardware. Calling ->startup() is
not an option, because drivers request interrupts there, and drivers
fail to handle situations when tty isn't opened with interrupts enabled.
So, we have to implement a new callback (actually, tty_ops already have
a similar callback), which does everything needed to initialize just the
hardware.
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---
drivers/tty/serial/serial_core.c | 15 +++++++++++++++
include/linux/serial_core.h | 1 +
2 files changed, 16 insertions(+)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index a21dc8e..cba8443 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2108,11 +2108,13 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
{
struct uart_driver *drv = driver->driver_state;
struct uart_state *state = drv->state + line;
+ struct tty_port *tport;
struct uart_port *port;
int baud = 9600;
int bits = 8;
int parity = 'n';
int flow = 'n';
+ int ret;
if (!state || !state->uart_port)
return -1;
@@ -2121,6 +2123,19 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
if (!(port->ops->poll_get_char && port->ops->poll_put_char))
return -1;
+ tport = &state->port;
+ if (!(tport->flags & ASYNC_INITIALIZED) && port->ops->poll_init) {
+ mutex_lock(&tport->mutex);
+ ret = port->ops->poll_init(port);
+ /*
+ * We don't set ASYNCB_INITIALIZED as we only initialized the
+ * hw, e.g. state->xmit is still uninitialized.
+ */
+ mutex_unlock(&tport->mutex);
+ if (ret)
+ return ret;
+ }
+
if (options) {
uart_parse_options(options, &baud, &parity, &bits, &flow);
return uart_set_options(port, NULL, baud, parity, bits, flow);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 0253c20..3642710 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -274,6 +274,7 @@ struct uart_ops {
int (*verify_port)(struct uart_port *, struct serial_struct *);
int (*ioctl)(struct uart_port *, unsigned int, unsigned long);
#ifdef CONFIG_CONSOLE_POLL
+ int (*poll_init)(struct uart_port *);
void (*poll_put_char)(struct uart_port *, unsigned char);
int (*poll_get_char)(struct uart_port *);
#endif
--
1.7.11.5
next prev parent reply other threads:[~2012-09-10 4:13 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 4:08 [PATCH v5 0/14] KGDB/KDB FIQ (NMI) debugger Anton Vorontsov
2012-09-10 4:08 ` Anton Vorontsov
2012-09-10 4:11 ` [PATCH 01/14] serial/amba-pl011: fix ages old copy-paste errors Anton Vorontsov
2012-09-10 4:11 ` Anton Vorontsov
2012-09-10 4:12 ` [PATCH 02/14] drivers/tty/serial/amba-pl0{10,11}.c: use clk_prepare_enable and clk_disable_unprepare Anton Vorontsov
2012-09-10 4:12 ` Anton Vorontsov
2012-09-10 4:12 ` [PATCH 03/14] kernel/debug: Mask KGDB NMI upon entry Anton Vorontsov
2012-09-10 4:12 ` Anton Vorontsov
2012-09-10 4:13 ` [PATCH 04/14] kdb: Implement disable_nmi command Anton Vorontsov
2012-09-10 4:13 ` Anton Vorontsov
2012-09-10 4:13 ` [PATCH 05/14] kdb: Turn KGDB_KDB=n stubs into static inlines Anton Vorontsov
2012-09-10 4:13 ` Anton Vorontsov
2012-09-10 4:13 ` Anton Vorontsov [this message]
2012-09-10 4:13 ` [PATCH 06/14] tty/serial/core: Introduce poll_init callback Anton Vorontsov
2012-09-10 11:13 ` Alan Cox
2012-09-10 11:13 ` Alan Cox
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 19:18 ` Alan Cox
2012-09-10 19:18 ` Alan Cox
2012-09-10 4:13 ` [PATCH 07/14] tty/serial/amba-pl011: Implement " Anton Vorontsov
2012-09-10 4:13 ` Anton Vorontsov
2012-09-10 4:13 ` [PATCH 08/14] tty/serial/kgdboc: Add and wire up clear_irqs callback Anton Vorontsov
2012-09-10 4:13 ` Anton Vorontsov
2012-09-10 11:16 ` Alan Cox
2012-09-10 11:16 ` Alan Cox
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 17:57 ` Anton Vorontsov
2012-09-10 19:19 ` Alan Cox
2012-09-10 19:19 ` Alan Cox
2012-09-10 20:13 ` Anton Vorontsov
2012-09-10 20:13 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 09/14] tty/serial/amba-pl011: Implement " Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
2012-09-10 11:17 ` Alan Cox
2012-09-10 11:17 ` Alan Cox
2012-09-10 17:56 ` Anton Vorontsov
2012-09-10 17:56 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 10/14] tty/serial: Add kgdb_nmi driver Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
2012-09-10 11:11 ` Alan Cox
2012-09-10 11:11 ` Alan Cox
2012-09-10 17:54 ` Anton Vorontsov
2012-09-10 17:54 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 11/14] ARM: Move some macros from entry-armv to entry-header Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 12/14] ARM: Add KGDB/KDB FIQ debugger generic code Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 13/14] ARM: VIC: Add a couple of low-level FIQ management helpers Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
2012-09-10 4:14 ` [PATCH 14/14] ARM: versatile: Make able to use UART ports for KGDB FIQ debugger Anton Vorontsov
2012-09-10 4:14 ` Anton Vorontsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120910041335.GF29537@lizard \
--to=anton.vorontsov@linaro.org \
--cc=akpm@linux-foundation.org \
--cc=alan@linux.intel.com \
--cc=arve@android.com \
--cc=ccross@android.com \
--cc=gregkh@linuxfoundation.org \
--cc=jason.wessel@windriver.com \
--cc=john.stultz@linaro.org \
--cc=kernel-team@android.com \
--cc=kgdb-bugreport@lists.sourceforge.net \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=patches@linaro.org \
--cc=swetland@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.