From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Evgeny Iakovlev" <eiakovlev@linux.microsoft.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Gavin Shan" <gshan@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PATCH v3 7/10] hw/char/pl011: Check if receiver is enabled
Date: Fri, 13 Oct 2023 16:11:28 +0200 [thread overview]
Message-ID: <20231013141131.1531-8-philmd@linaro.org> (raw)
In-Reply-To: <20231013141131.1531-1-philmd@linaro.org>
Do not receive characters when UART or receiver are disabled.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
TODO: Understand Richard comment from v2:
this doesn't fall under "my first assembly program" because
it isn't part of "Hello, World"?
---
hw/char/pl011.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 9c43cb47bf..ca931be139 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -77,6 +77,7 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr)
#define LCR_BRK (1 << 0)
/* Control Register, UARTCR */
+#define CR_RXE (1 << 9)
#define CR_TXE (1 << 8)
#define CR_UARTEN (1 << 0)
@@ -359,9 +360,11 @@ static void pl011_write(void *opaque, hwaddr offset,
static int pl011_can_receive(void *opaque)
{
PL011State *s = (PL011State *)opaque;
- int r;
+ int r = 0;
- r = s->read_count < pl011_get_fifo_depth(s);
+ if ((s->cr & CR_UARTEN) && (s->cr & CR_RXE)) {
+ r = s->read_count < pl011_get_fifo_depth(s);
+ }
trace_pl011_can_receive(s->lcr, s->read_count, r);
return r;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-13 14:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 14:11 [PATCH v3 0/10] hw/char/pl011: Implement TX (async) FIFO to avoid blocking the main loop Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 1/10] util/fifo8: Allow fifo8_pop_buf() to not populate popped length Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 2/10] util/fifo8: Introduce fifo8_peek_buf() Philippe Mathieu-Daudé
2023-10-13 16:59 ` Alex Bennée
2023-10-13 14:11 ` [PATCH v3 3/10] hw/char/pl011: Split RX/TX path of pl011_reset_fifo() Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 4/10] hw/char/pl011: Extract pl011_write_txdata() from pl011_write() Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 5/10] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read() Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 6/10] hw/char/pl011: Warn when using disabled transmitter Philippe Mathieu-Daudé
2023-10-13 14:11 ` Philippe Mathieu-Daudé [this message]
2023-10-13 14:11 ` [PATCH v3 8/10] hw/char/pl011: Rename RX FIFO methods Philippe Mathieu-Daudé
2023-10-13 14:11 ` [PATCH v3 9/10] hw/char/pl011: Add transmit FIFO to PL011State Philippe Mathieu-Daudé
2023-10-13 17:05 ` Alex Bennée
2023-10-13 18:14 ` Richard Henderson
2023-10-13 17:08 ` [PATCH v3 0/10] hw/char/pl011: Implement TX (async) FIFO to avoid blocking the main loop Alex Bennée
2023-10-14 6:40 ` Mark Cave-Ayland
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=20231013141131.1531-8-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=eiakovlev@linux.microsoft.com \
--cc=gshan@redhat.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 \
--cc=richard.henderson@linaro.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).