2020-08-28 04:53:35 +00:00
|
|
|
From 837f9ac5cf843158a80eed6d60166ee7c9716c1a Mon Sep 17 00:00:00 2001
|
|
|
|
Message-Id: <837f9ac5cf843158a80eed6d60166ee7c9716c1a.1596234183.git.zanussi@kernel.org>
|
|
|
|
In-Reply-To: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
|
|
|
References: <378ee68279f6a7631221f2670a9298620148690d.1596234183.git.zanussi@kernel.org>
|
2018-08-27 14:32:32 +00:00
|
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
Date: Thu, 28 Jul 2011 13:32:57 +0200
|
2020-07-15 20:05:29 +00:00
|
|
|
Subject: [PATCH 164/329] tty/serial/omap: Make the locking RT aware
|
2020-08-28 04:53:35 +00:00
|
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.135-rt60.tar.xz
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
The lock is a sleeping lock and local_irq_save() is not the
|
|
|
|
optimsation we are looking for. Redo it to make it work on -RT and
|
|
|
|
non-RT.
|
|
|
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
drivers/tty/serial/omap-serial.c | 12 ++++--------
|
2018-08-27 14:32:32 +00:00
|
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
|
|
|
|
index 6420ae581a80..0f4f41ed9ffa 100644
|
2018-08-27 14:32:32 +00:00
|
|
|
--- a/drivers/tty/serial/omap-serial.c
|
|
|
|
+++ b/drivers/tty/serial/omap-serial.c
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -1307,13 +1307,10 @@ serial_omap_console_write(struct console *co, const char *s,
|
2018-08-27 14:32:32 +00:00
|
|
|
|
|
|
|
pm_runtime_get_sync(up->dev);
|
|
|
|
|
|
|
|
- local_irq_save(flags);
|
|
|
|
- if (up->port.sysrq)
|
|
|
|
- locked = 0;
|
|
|
|
- else if (oops_in_progress)
|
|
|
|
- locked = spin_trylock(&up->port.lock);
|
|
|
|
+ if (up->port.sysrq || oops_in_progress)
|
|
|
|
+ locked = spin_trylock_irqsave(&up->port.lock, flags);
|
|
|
|
else
|
|
|
|
- spin_lock(&up->port.lock);
|
|
|
|
+ spin_lock_irqsave(&up->port.lock, flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First save the IER then disable the interrupts
|
2019-04-08 23:49:20 +00:00
|
|
|
@@ -1342,8 +1339,7 @@ serial_omap_console_write(struct console *co, const char *s,
|
2018-08-27 14:32:32 +00:00
|
|
|
pm_runtime_mark_last_busy(up->dev);
|
|
|
|
pm_runtime_put_autosuspend(up->dev);
|
|
|
|
if (locked)
|
|
|
|
- spin_unlock(&up->port.lock);
|
|
|
|
- local_irq_restore(flags);
|
|
|
|
+ spin_unlock_irqrestore(&up->port.lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init
|
2020-01-03 23:36:11 +00:00
|
|
|
--
|
2020-06-22 13:14:16 +00:00
|
|
|
2.17.1
|
2020-01-03 23:36:11 +00:00
|
|
|
|