From: John Ogness <john.ogness@linutronix.de>
To: gregkh@linuxfoundation.org
Cc: vinod.koul@intel.com
Cc: dan.j.williams@intel.com
Cc: peter@hurleysoftware.com
Cc: bigeasy@linutronix.de
Cc: tony@atomide.com
Cc: nsekhar@ti.com
Cc: peter.ujfalusi@ti.com
Cc: dmaengine@vger.kernel.org
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] tty: serial: 8250: add optional spinlock arg to serial8250_rx_chars
Date: Fri, 22 Jan 2016 11:27:43 +0100 [thread overview]
Message-ID: <877fj1rjs0.fsf@linutronix.de> (raw)
serial8250_rx_chars() must be called from interrupt context and with
the port lock held. The port lock is released temporarily within that
function to call tty_flip_buffer_push(). However, there may be other
drivers that need to synchronize the tty_flip_buffer_push() call within
serial8250_rx_chars() with other contexts. Since the port lock cannot
be used for this synchronization, an optional spinlock argument is added.
If non-NULL, this will be locked during the tty_flip_buffer_push() call.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
---
patch against next-20160122
drivers/tty/serial/8250/8250_fsl.c | 2 +-
drivers/tty/serial/8250/8250_omap.c | 2 +-
drivers/tty/serial/8250/8250_port.c | 9 +++++++--
include/linux/serial_8250.h | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c
index 910bfee..790868d 100644
--- a/drivers/tty/serial/8250/8250_fsl.c
+++ b/drivers/tty/serial/8250/8250_fsl.c
@@ -49,7 +49,7 @@ int fsl8250_handle_irq(struct uart_port *port)
lsr = orig_lsr = up->port.serial_in(&up->port, UART_LSR);
if (lsr & (UART_LSR_DR | UART_LSR_BI))
- lsr = serial8250_rx_chars(up, lsr);
+ lsr = serial8250_rx_chars(up, lsr, NULL);
serial8250_modem_status(up);
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index a2c0734..6cf3b4f 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1024,7 +1024,7 @@ static int omap_8250_dma_handle_irq(struct uart_port *port)
dma_err = omap_8250_rx_dma(up, iir);
if (dma_err) {
- status = serial8250_rx_chars(up, status);
+ status = serial8250_rx_chars(up, status, NULL);
omap_8250_rx_dma(up, 0);
}
}
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 8d262bc..e838115 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1418,7 +1418,8 @@ static void serial8250_enable_ms(struct uart_port *port)
* by this Rx routine.
*/
unsigned char
-serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
+serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr,
+ spinlock_t *flip_lock)
{
struct uart_port *port = &up->port;
unsigned char ch;
@@ -1485,7 +1486,11 @@ ignore_char:
lsr = serial_in(up, UART_LSR);
} while ((lsr & (UART_LSR_DR | UART_LSR_BI)) && (--max_count > 0));
spin_unlock(&port->lock);
+ if (flip_lock)
+ spin_lock(flip_lock);
tty_flip_buffer_push(&port->state->port);
+ if (flip_lock)
+ spin_unlock(flip_lock);
spin_lock(&port->lock);
return lsr;
}
@@ -1591,7 +1596,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
dma_err = up->dma->rx_dma(up, iir);
if (!up->dma || dma_err)
- status = serial8250_rx_chars(up, status);
+ status = serial8250_rx_chars(up, status, NULL);
}
serial8250_modem_status(up);
if ((!up->dma || (up->dma && up->dma->tx_err)) &&
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index faa0e03..9c814e3 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -147,7 +147,8 @@ extern void serial8250_do_pm(struct uart_port *port, unsigned int state,
extern void serial8250_do_set_mctrl(struct uart_port *port, unsigned int mctrl);
extern int fsl8250_handle_irq(struct uart_port *port);
int serial8250_handle_irq(struct uart_port *port, unsigned int iir);
-unsigned char serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr);
+unsigned char serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr,
+ spinlock_t *flip_lock);
void serial8250_tx_chars(struct uart_8250_port *up);
unsigned int serial8250_modem_status(struct uart_8250_port *up);
void serial8250_init_port(struct uart_8250_port *up);
--
1.7.10.4
next reply other threads:[~2016-01-22 10:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 10:27 John Ogness [this message]
2016-01-22 16:18 ` Peter Hurley
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=877fj1rjs0.fsf@linutronix.de \
--to=john.ogness@linutronix.de \
--cc=gregkh@linuxfoundation.org \
--cc=vinod.koul@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome