[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/11] hw/char/pl011: Split RX/TX path of pl011_reset_fifo()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 05/11] hw/char/pl011: Split RX/TX path of pl011_reset_fifo() |
Date: |
Mon, 10 Jul 2023 19:50:56 +0200 |
To be able to reset the RX or TX FIFO separately,
split pl011_reset_fifo() in two.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
hw/char/pl011.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 58edeb9ddb..1f07c7b021 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -132,14 +132,21 @@ static inline unsigned pl011_get_fifo_depth(PL011State *s)
return pl011_is_fifo_enabled(s) ? PL011_FIFO_DEPTH : 1;
}
-static inline void pl011_reset_fifo(PL011State *s)
+static inline void pl011_reset_rx_fifo(PL011State *s)
{
s->read_count = 0;
s->read_pos = 0;
/* Reset FIFO flags */
- s->flags &= ~(PL011_FLAG_RXFF | PL011_FLAG_TXFF);
- s->flags |= PL011_FLAG_RXFE | PL011_FLAG_TXFE;
+ s->flags &= ~PL011_FLAG_RXFF;
+ s->flags |= PL011_FLAG_RXFE;
+}
+
+static inline void pl011_reset_tx_fifo(PL011State *s)
+{
+ /* Reset FIFO flags */
+ s->flags &= ~PL011_FLAG_TXFF;
+ s->flags |= PL011_FLAG_TXFE;
}
static uint64_t pl011_read(void *opaque, hwaddr offset,
@@ -289,7 +296,8 @@ static void pl011_write(void *opaque, hwaddr offset,
case 11: /* UARTLCR_H */
/* Reset the FIFO state on FIFO enable or disable */
if ((s->lcr ^ value) & LCR_FEN) {
- pl011_reset_fifo(s);
+ pl011_reset_rx_fifo(s);
+ pl011_reset_tx_fifo(s);
}
if ((s->lcr ^ value) & LCR_BRK) {
int break_enable = value & LCR_BRK;
@@ -506,7 +514,8 @@ static void pl011_reset(DeviceState *dev)
s->ifl = 0x12;
s->cr = 0x300;
s->flags = 0;
- pl011_reset_fifo(s);
+ pl011_reset_rx_fifo(s);
+ pl011_reset_tx_fifo(s);
}
static void pl011_class_init(ObjectClass *oc, void *data)
--
2.38.1
- [PATCH v2 02/11] hw/char/pl011: Display register name in trace events, (continued)
- [PATCH v2 02/11] hw/char/pl011: Display register name in trace events, Philippe Mathieu-Daudé, 2023/07/10
- [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é <=
- [PATCH v2 08/11] hw/char/pl011: Warn when using disabled transmitter, Philippe Mathieu-Daudé, 2023/07/10
- [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