* [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware
@ 2017-03-22 17:12 Lionel Debieve
2017-03-23 7:56 ` Patrice CHOTARD
2017-03-29 16:10 ` Sebastian Andrzej Siewior
0 siblings, 2 replies; 3+ messages in thread
From: Lionel Debieve @ 2017-03-22 17:12 UTC (permalink / raw)
To: Patrice Chotard, Greg Kroah-Hartman, Jiri Slaby
Cc: linux-serial, linux-kernel, linux-arm-kernel, linux-rt-users,
Lionel Debieve
The lock is a sleeping lock and local_irq_save() is not the
standard implementation now. Working for both -RT and non
RT.
Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
---
drivers/tty/serial/st-asc.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index c334bcc..4889396 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -887,13 +887,12 @@ static void asc_console_write(struct console *co, const char *s, unsigned count)
int locked = 1;
u32 intenable;
- local_irq_save(flags);
if (port->sysrq)
locked = 0; /* asc_interrupt has already claimed the lock */
else if (oops_in_progress)
- locked = spin_trylock(&port->lock);
+ locked = spin_trylock_irqsave(&port->lock, flags);
else
- spin_lock(&port->lock);
+ spin_lock_irqsave(&port->lock, flags);
/*
* Disable interrupts so we don't get the IRQ line bouncing
@@ -911,8 +910,7 @@ static void asc_console_write(struct console *co, const char *s, unsigned count)
asc_out(port, ASC_INTEN, intenable);
if (locked)
- spin_unlock(&port->lock);
- local_irq_restore(flags);
+ spin_unlock_irqrestore(&port->lock, flags);
}
static int asc_console_setup(struct console *co, char *options)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware
2017-03-22 17:12 [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware Lionel Debieve
@ 2017-03-23 7:56 ` Patrice CHOTARD
2017-03-29 16:10 ` Sebastian Andrzej Siewior
1 sibling, 0 replies; 3+ messages in thread
From: Patrice CHOTARD @ 2017-03-23 7:56 UTC (permalink / raw)
To: Lionel DEBIEVE, Greg Kroah-Hartman, Jiri Slaby
Cc: linux-serial, linux-kernel, linux-arm-kernel, linux-rt-users
Hi Lionel
On 03/22/2017 06:12 PM, Lionel Debieve wrote:
> The lock is a sleeping lock and local_irq_save() is not the
> standard implementation now. Working for both -RT and non
> RT.
>
> Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
> ---
> drivers/tty/serial/st-asc.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
> index c334bcc..4889396 100644
> --- a/drivers/tty/serial/st-asc.c
> +++ b/drivers/tty/serial/st-asc.c
> @@ -887,13 +887,12 @@ static void asc_console_write(struct console *co, const char *s, unsigned count)
> int locked = 1;
> u32 intenable;
>
> - local_irq_save(flags);
> if (port->sysrq)
> locked = 0; /* asc_interrupt has already claimed the lock */
> else if (oops_in_progress)
> - locked = spin_trylock(&port->lock);
> + locked = spin_trylock_irqsave(&port->lock, flags);
> else
> - spin_lock(&port->lock);
> + spin_lock_irqsave(&port->lock, flags);
>
> /*
> * Disable interrupts so we don't get the IRQ line bouncing
> @@ -911,8 +910,7 @@ static void asc_console_write(struct console *co, const char *s, unsigned count)
> asc_out(port, ASC_INTEN, intenable);
>
> if (locked)
> - spin_unlock(&port->lock);
> - local_irq_restore(flags);
> + spin_unlock_irqrestore(&port->lock, flags);
> }
>
> static int asc_console_setup(struct console *co, char *options)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware
2017-03-22 17:12 [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware Lionel Debieve
2017-03-23 7:56 ` Patrice CHOTARD
@ 2017-03-29 16:10 ` Sebastian Andrzej Siewior
1 sibling, 0 replies; 3+ messages in thread
From: Sebastian Andrzej Siewior @ 2017-03-29 16:10 UTC (permalink / raw)
To: Lionel Debieve
Cc: Patrice Chotard, Greg Kroah-Hartman, Jiri Slaby, linux-serial,
linux-kernel, linux-arm-kernel, linux-rt-users
On 2017-03-22 18:12:31 [+0100], Lionel Debieve wrote:
> The lock is a sleeping lock and local_irq_save() is not the
> standard implementation now. Working for both -RT and non
> RT.
>
> Signed-off-by: Lionel Debieve <lionel.debieve@st.com>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
This is how serial8250_console_write() looks upstream, too.
Sebastian
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-29 16:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-22 17:12 [PATCH 1/1] tty: serial: st-asc: Make the locking RT aware Lionel Debieve
2017-03-23 7:56 ` Patrice CHOTARD
2017-03-29 16:10 ` Sebastian Andrzej Siewior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).