Skip to contentSkip to conversation

lib: serial: fix RX path in litex-uart

PATCH New Gabriel Somlo 2 participants 2 messages Jun 7, 2024 – Jun 14, 2024 Litex platform

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: serial: fix RX path in litex-uart

When used to read characters from the terminal (e.g., when the SBI console is used via ecall from linux with console=hvc0), we must acknowledge receipt of each character to "pop" it off the LiteUART hardware queue, and allow the next character to be made available.

Fixes 52af6e4b ("lib: utils: Add LiteX UART support")
---
 lib/utils/serial/litex-uart.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
lib/utils/serial/litex-uart.c +8 -2
index f843bf3..caf8699 100644
@@ -20,6 +20,8 @@
 #define UART_REG_EV_PENDING	4
 #define UART_REG_EV_ENABLE	5
 
+#define UART_EV_RX		0x2
+
 /* clang-format on */
 
 static volatile u32 *uart_base;
@@ -42,10 +44,14 @@ static void litex_uart_putc(char ch)
 
 static int litex_uart_getc(void)
 {
+	int ret;
+
 	if (get_reg(UART_REG_RXEMPTY))
 		return -1;
-	else
-		return get_reg(UART_REG_RXTX);
+
+	ret = get_reg(UART_REG_RXTX);
+	set_reg(UART_REG_EV_PENDING, UART_EV_RX); /* ack. char read */
+	return ret;
 }
 
 static struct sbi_console_device litex_console = {
Signature · 1 line
2.45.1
Applied
#1 lore raw

PATCH 1/1 lib: serial: fix RX path in litex-uart

Quoted 9 lines · On Fri, Jun 7, 2024 at 11:54?PM Gabriel Somlo <[email protected]> wrote:

When used to read characters from the terminal (e.g., when the SBI console is used via ecall from linux with console=hvc0), we must acknowledge receipt of each character to "pop" it off the LiteUART hardware queue, and allow the next character to be made available.

Fixes 52af6e4b ("lib: utils: Add LiteX UART support")

LGTM.

Applied this patch to the riscv/opensbi repo.

Thanks,
Anup

Quoted 42 lines
---
 lib/utils/serial/litex-uart.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
lib/utils/serial/litex-uart.c +8 -3
index f843bf3..caf8699 100644
@@ -20,6 +20,8 @@
 #define UART_REG_EV_PENDING    4
 #define UART_REG_EV_ENABLE     5
 
+#define UART_EV_RX             0x2
+
 /* clang-format on */
 
 static volatile u32 *uart_base;
@@ -42,10 +44,14 @@ static void litex_uart_putc(char ch)
 
 static int litex_uart_getc(void)
 {
+       int ret;
+
        if (get_reg(UART_REG_RXEMPTY))
                return -1;
-       else
-               return get_reg(UART_REG_RXTX);
+
+       ret = get_reg(UART_REG_RXTX);
+       set_reg(UART_REG_EV_PENDING, UART_EV_RX); /* ack. char read */
+       return ret;
 }
 
 static struct sbi_console_device litex_console = {
--

2.45.1

--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi