mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jslaby@suse.cz>, Tobias Klauser <tklauser@distanz.ch>
Subject: [PATCH 4/4] tty: serial: do unlock on a common path in altera_jtaguart_console_putc()
Date: Tue, 27 Sep 2022 13:18:19 +0200	[thread overview]
Message-ID: <20220927111819.18516-4-jslaby@suse.cz> (raw)
In-Reply-To: <20220927111819.18516-1-jslaby@suse.cz>

port->lock is unlocked in each branch in altera_jtaguart_console_putc(),
so do it before the "if". "status" needs not be under the lock, as the
register was already read.

Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 drivers/tty/serial/altera_jtaguart.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index ac8ce418de36..c2d154d78e54 100644
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -310,11 +310,12 @@ static void altera_jtaguart_console_putc(struct uart_port *port, unsigned char c
 
 	spin_lock_irqsave(&port->lock, flags);
 	while (!altera_jtaguart_tx_space(port, &status)) {
+		spin_unlock_irqrestore(&port->lock, flags);
+
 		if ((status & ALTERA_JTAGUART_CONTROL_AC_MSK) == 0) {
-			spin_unlock_irqrestore(&port->lock, flags);
 			return;	/* no connection activity */
 		}
-		spin_unlock_irqrestore(&port->lock, flags);
+
 		cpu_relax();
 		spin_lock_irqsave(&port->lock, flags);
 	}
-- 
2.37.3


  parent reply	other threads:[~2022-09-27 11:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-27 11:18 [PATCH 1/4] tty: serial: extend lqasc_tx_ready() to lqasc_console_putchar() Jiri Slaby
2022-09-27 11:18 ` [PATCH 2/4] tty: serial: use FIELD_GET() in lqasc_tx_ready() Jiri Slaby
2022-09-27 11:48   ` Ilpo Järvinen
2022-09-27 11:18 ` [PATCH 3/4] tty: serial: unify TX space reads under altera_jtaguart_tx_space() Jiri Slaby
2022-09-27 15:04   ` Tobias Klauser
2022-09-28 10:26   ` Ilpo Järvinen
2022-09-27 11:18 ` Jiri Slaby [this message]
2022-09-27 14:59   ` [PATCH 4/4] tty: serial: do unlock on a common path in altera_jtaguart_console_putc() Tobias Klauser
2022-09-28 10:27   ` Ilpo Järvinen
2022-09-27 11:47 ` [PATCH 1/4] tty: serial: extend lqasc_tx_ready() to lqasc_console_putchar() Ilpo Järvinen

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=20220927111819.18516-4-jslaby@suse.cz \
    --to=jslaby@suse.cz \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=tklauser@distanz.ch \
    /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

all inboxes | Powered by JetHome®