summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-09-10 15:06:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-23 21:19:34 -0700
commit4d90bb147ef6b91f529a21b498ff2b5fdc6785b4 (patch)
treeb6ae1e41260d1591aeabc56bb54969ffb4061729 /drivers/tty
parent9a37110d20c95d1ebf6c04881177fe8f62831db2 (diff)
downloadlinux-4d90bb147ef6b91f529a21b498ff2b5fdc6785b4.tar.gz
linux-4d90bb147ef6b91f529a21b498ff2b5fdc6785b4.tar.bz2
linux-4d90bb147ef6b91f529a21b498ff2b5fdc6785b4.zip
serial: core: Document and assert lock requirements for irq helpers
The serial core provides two helper functions, uart_handle_dcd_change() and uart_handle_cts_change(), for UART drivers to use at interrupt time. The serial core expects the UART driver to hold the uart port lock when calling these helpers to prevent state corruption. If lockdep enabled, trigger a warning if the uart port lock is not held when calling these helper functions. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/serial_core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 5a78f6940760..f764de32b658 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2743,6 +2743,8 @@ EXPORT_SYMBOL(uart_match_port);
* uart_handle_dcd_change - handle a change of carrier detect state
* @uport: uart_port structure for the open port
* @status: new carrier detect status, nonzero if active
+ *
+ * Caller must hold uport->lock
*/
void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
{
@@ -2750,6 +2752,8 @@ void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
struct tty_struct *tty = port->tty;
struct tty_ldisc *ld;
+ lockdep_assert_held_once(&uport->lock);
+
if (tty) {
ld = tty_ldisc_ref(tty);
if (ld) {
@@ -2774,12 +2778,16 @@ EXPORT_SYMBOL_GPL(uart_handle_dcd_change);
* uart_handle_cts_change - handle a change of clear-to-send state
* @uport: uart_port structure for the open port
* @status: new clear to send status, nonzero if active
+ *
+ * Caller must hold uport->lock
*/
void uart_handle_cts_change(struct uart_port *uport, unsigned int status)
{
struct tty_port *port = &uport->state->port;
struct tty_struct *tty = port->tty;
+ lockdep_assert_held_once(&uport->lock);
+
uport->icount.cts++;
if (tty_port_cts_enabled(port)) {