qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	qemu-arm@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Evgeny Iakovlev" <eiakovlev@linux.microsoft.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 09/12] hw/char/pl011: Check if transmitter is enabled
Date: Mon, 22 May 2023 17:31:41 +0200	[thread overview]
Message-ID: <20230522153144.30610-10-philmd@linaro.org> (raw)
In-Reply-To: <20230522153144.30610-1-philmd@linaro.org>

Do not transmit characters when UART or transmitter are disabled.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/char/pl011.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index c55ef41fbf..30bedeac15 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -76,6 +76,10 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr)
 #define LCR_FEN     (1 << 4)
 #define LCR_BRK     (1 << 0)
 
+/* Control Register, UARTCR */
+#define CR_TXE      (1 << 8)
+#define CR_UARTEN   (1 << 0)
+
 static const unsigned char pl011_id_arm[8] =
   { 0x11, 0x10, 0x14, 0x00, 0x0d, 0xf0, 0x05, 0xb1 };
 static const unsigned char pl011_id_luminary[8] =
@@ -151,7 +155,9 @@ static inline void pl011_reset_tx_fifo(PL011State *s)
 
 static void pl011_write_tx(PL011State *s, const uint8_t *buf, int length)
 {
-    /* ??? Check if transmitter is enabled.  */
+    if (!(s->cr & (CR_UARTEN | CR_TXE))) {
+        return;
+    }
 
     /* XXX this blocks entire thread. Rewrite to use
      * qemu_chr_fe_write and background I/O callbacks */
-- 
2.38.1



  parent reply	other threads:[~2023-05-22 15:37 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-22 15:31 [PATCH 00/12] hw/char/pl011: Implement TX (async) FIFO to avoid blocking the main loop Philippe Mathieu-Daudé
2023-05-22 15:31 ` [PATCH 01/12] util/fifo8: Fix typo in fifo8_push_all() description Philippe Mathieu-Daudé
2023-05-22 19:06   ` Francisco Iglesias
2023-05-23 13:22   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 02/12] util/fifo8: Allow fifo8_pop_buf() to not populate popped length Philippe Mathieu-Daudé
2023-05-22 19:13   ` Francisco Iglesias
2023-05-23 13:25   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 03/12] util/fifo8: Introduce fifo8_peek_buf() Philippe Mathieu-Daudé
2023-05-22 19:38   ` Francisco Iglesias
2023-05-23 13:25   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 04/12] hw/char/pl011: Display register name in trace events Philippe Mathieu-Daudé
2023-05-23 13:31   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 05/12] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions Philippe Mathieu-Daudé
2023-05-23 13:32   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 06/12] hw/char/pl011: Replace magic values by register field definitions Philippe Mathieu-Daudé
2023-05-23 13:34   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 07/12] hw/char/pl011: Split RX/TX path of pl011_reset_fifo() Philippe Mathieu-Daudé
2023-05-23 13:35   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 08/12] hw/char/pl011: Extract pl011_write_tx() from pl011_write() Philippe Mathieu-Daudé
2023-05-23 13:36   ` Alex Bennée
2023-05-22 15:31 ` Philippe Mathieu-Daudé [this message]
2023-05-23 13:36   ` [PATCH 09/12] hw/char/pl011: Check if transmitter is enabled Alex Bennée
2023-05-25 12:30   ` Peter Maydell
2023-05-25 12:51     ` Alex Bennée
2023-05-25 12:55       ` Peter Maydell
2023-05-25 13:17         ` Philippe Mathieu-Daudé
2023-05-22 15:31 ` [PATCH 10/12] hw/char/pl011: Check if receiver " Philippe Mathieu-Daudé
2023-05-23 13:38   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 11/12] hw/char/pl011: Rename RX FIFO methods Philippe Mathieu-Daudé
2023-05-23 13:39   ` Alex Bennée
2023-05-22 15:31 ` [PATCH 12/12] hw/char/pl011: Implement TX FIFO Philippe Mathieu-Daudé
2023-05-23 13:47   ` Alex Bennée

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=20230522153144.30610-10-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=eiakovlev@linux.microsoft.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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;
as well as URLs for NNTP newsgroup(s).