[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 08/11] hw/char/pl011: Warn when using disabled transmitter
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 08/11] hw/char/pl011: Warn when using disabled transmitter |
Date: |
Mon, 10 Jul 2023 19:50:59 +0200 |
We shouldn't transmit characters when the full UART or its
transmitter is disabled. However we don't want to break the
possibly incomplete "my first bare metal assembly program"s,
so we choose to simply display a warning when this occurs.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
hw/char/pl011.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index e2e3d48b91..03dce0a1ec 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,12 @@ static inline void pl011_reset_tx_fifo(PL011State *s)
static void pl011_write_txdata(PL011State *s, const uint8_t *buf, int length)
{
- /* ??? Check if transmitter is enabled. */
+ if (!(s->cr & CR_UARTEN)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "PL011 write data but UART disabled\n");
+ }
+ if (!(s->cr & CR_TXE)) {
+ qemu_log_mask(LOG_GUEST_ERROR, "PL011 write data but TX disabled\n");
+ }
/* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */
--
2.38.1
- [PATCH v2 03/11] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions, (continued)
- [PATCH v2 03/11] hw/char/pl011: Remove duplicated PL011_INT_[RT]X definitions, Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 04/11] hw/char/pl011: Replace magic values by register field definitions, Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 01/11] hw/char/pl011: Restrict MemoryRegionOps implementation access sizes, Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 06/11] hw/char/pl011: Extract pl011_write_txdata() from pl011_write(), Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 05/11] hw/char/pl011: Split RX/TX path of pl011_reset_fifo(), Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 08/11] hw/char/pl011: Warn when using disabled transmitter,
Philippe Mathieu-Daudé <=
- [PATCH v2 07/11] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read(), Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 09/11] hw/char/pl011: Check if receiver is enabled, Philippe Mathieu-Daudé, 2023/07/10
- [PATCH v2 10/11] hw/char/pl011: Rename RX FIFO methods, Philippe Mathieu-Daudé, 2023/07/10
- [RFC PATCH v2 11/11] hw/char/pl011: Implement TX FIFO, Philippe Mathieu-Daudé, 2023/07/10