[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 10/16] hw/char/pl011: Check if receiver is enabled
From: |
Peter Maydell |
Subject: |
Re: [PATCH v5 10/16] hw/char/pl011: Check if receiver is enabled |
Date: |
Mon, 29 Jul 2024 16:51:28 +0100 |
On Fri, 19 Jul 2024 at 19:11, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> 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>
> ---
> 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 c76283dccf..0ce91c13d3 100644
> --- a/hw/char/pl011.c
> +++ b/hw/char/pl011.c
> @@ -85,6 +85,7 @@ DeviceState *pl011_create(hwaddr addr, qemu_irq irq,
> Chardev *chr)
> #define CR_OUT1 (1 << 12)
> #define CR_RTS (1 << 11)
> #define CR_DTR (1 << 10)
> +#define CR_RXE (1 << 9)
> #define CR_TXE (1 << 8)
> #define CR_LBE (1 << 7)
> #define CR_UARTEN (1 << 0)
> @@ -481,9 +482,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;
I have a vague recollection of a previous conversation
where we discussed whether tightening up the UART-enable
checks would break existing only-tested-on-QEMU baremetal
simple example code. But I can't find it in my email
archive -- do you remember a discussion about this or
am I misremembering?
thanks
-- PMM
- Re: [PATCH v5 03/16] hw/char/pl011: Move pl011_put_fifo() earlier, (continued)
- [PATCH v5 04/16] hw/char/pl011: Move pl011_loopback_enabled|tx() around, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 05/16] hw/char/pl011: Split RX/TX path of pl011_reset_fifo(), Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 06/16] hw/char/pl011: Extract pl011_write_txdata() from pl011_write(), Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 07/16] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read(), Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 08/16] hw/char/pl011: Warn when using disabled transmitter, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 09/16] tests/qtest: Update tests using PL011 UART, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 10/16] hw/char/pl011: Check if receiver is enabled, Philippe Mathieu-Daudé, 2024/07/19
- Re: [PATCH v5 10/16] hw/char/pl011: Check if receiver is enabled,
Peter Maydell <=
- [PATCH v5 13/16] hw/char/pl011: Introduce pl011_xmit() as GSource, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 11/16] hw/char/pl011: Rename RX FIFO methods, Philippe Mathieu-Daudé, 2024/07/19
- [RFC PATCH v5 16/16] hw/char/pl011: Implement TX FIFO, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 12/16] hw/char/pl011: Add transmit FIFO to PL011State, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 15/16] hw/char/pl011: Drain TX FIFO when no backend connected, Philippe Mathieu-Daudé, 2024/07/19
- [PATCH v5 14/16] hw/char/pl011: Consider TX FIFO overrun error, Philippe Mathieu-Daudé, 2024/07/19