riscv: sifive_uart: Generate TX interrupt
Subsystems (2)
PATCH 1/2 riscv: sifive_uart: Generate TX interrupt
At present the sifive uart model only generates RX interrupt. This updates it to generate TX interrupt so that it is more useful.
Note the TX fifo is still unimplemented.
---
hw/riscv/sifive_uart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/riscv/sifive_uart.c +3 -1
@@ -51,7 +51,8 @@ static uint64_t uart_ip(SiFiveUARTState *s)static void update_irq (SiFiveUARTState *s) {int cond =0 ; -if ((s->ie &SIFIVE_UART_IE_RXWM ) && s->rx_fifo_len) { +if ((s->ie &SIFIVE_UART_IE_TXWM ) || + ((s->ie &SIFIVE_UART_IE_RXWM ) && s->rx_fifo_len)) { cond =1 ; }if (cond) {
@@ -108,6 +109,7 @@ uart_write(void *opaque, hwaddr addr,switch (addr) {case SIFIVE_UART_TXFIFO :qemu_chr_fe_write (&s->chr, &ch,1 ); +update_irq (s);return ;case SIFIVE_UART_IE : s->ie = val64;
Signature · 1 line
2.7.4
PATCH 2/2 riscv: sifive_u: Correct UART0's IRQ in the device tree
The UART0's interrupt vector is wrongly set to 1 in the device tree. Use SIFIVE_U_UART0_IRQ instead.
---
hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/riscv/sifive_u.c +1 -1
@@ -244,7 +244,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,SIFIVE_U_CLOCK_FREQ /2 );qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,1 ); +qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" , nodename);
Signature · 1 line
2.7.4
Re: [Qemu-riscv] [Qemu-devel] [PATCH 2/2] riscv: sifive_u: Correct UART0's IRQ in the device tree
Quoted 5 lines · Bin Meng
The UART0's interrupt vector is wrongly set to 1 in the device tree. Use
SIFIVE_U_UART0_IRQinstead.Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 22 lines
---
hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/riscv/sifive_u.c +1
-2@@ -244,7 +244,7 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,SIFIVE_U_CLOCK_FREQ /2 );qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle); -qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,1 ); +qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" , nodename); --2.7.4
Quoted 7 lines · Bin Meng
At present the sifive uart model only generates RX interrupt. This updates it to generate TX interrupt so that it is more useful.
Note the TX fifo is still unimplemented.
Signed-off-by Bin Meng <[email protected]>
Alistair
Quoted 31 lines
---
hw/riscv/sifive_uart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)hw/riscv/sifive_uart.c +3
-2@@ -51,7 +51,8 @@ static uint64_t uart_ip(SiFiveUARTState *s)static void update_irq (SiFiveUARTState *s) {int cond =0 ; -if ((s->ie &SIFIVE_UART_IE_RXWM ) && s->rx_fifo_len) { +if ((s->ie &SIFIVE_UART_IE_TXWM ) || + ((s->ie &SIFIVE_UART_IE_RXWM ) && s->rx_fifo_len)) { cond =1 ; }if (cond) {@@ -108,6 +109,7 @@ uart_write(void *opaque, hwaddr addr,switch (addr) {case SIFIVE_UART_TXFIFO :qemu_chr_fe_write (&s->chr, &ch,1 ); +update_irq (s);return ;case SIFIVE_UART_IE : s->ie = val64; --2.7.4