Skip to contentSkip to conversation

hw/riscv/virt: Add serial alias in DTB

PATCH Applied Vasilis Liaskovitis 2 participants 3 messages Jan 16, 2025 – Jan 31, 2025 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 hw/riscv/virt: Add serial alias in DTB

Add an "aliases" node with a "serial0" entry for the single UART in the riscv virt machine.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2774

---
 hw/riscv/virt.c | 3 +++
 1 file changed, 3 insertions(+)
hw/riscv/virt.c +3 -0
index 2bc5a9dd98..fb1928cebf 100644
@@ -971,6 +971,7 @@ static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap,
     }
 
     qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", name);
+    qemu_fdt_setprop_string(ms->fdt, "/aliases", "serial0", name);
 }
 
 static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap,
@@ -1180,6 +1181,8 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap)
     qemu_fdt_setprop(ms->fdt, "/chosen", "rng-seed",
                      rng_seed, sizeof(rng_seed));
 
+    qemu_fdt_add_subnode(ms->fdt, "/aliases");
+
     create_fdt_flash(s, memmap);
     create_fdt_fw_cfg(s, memmap);
     create_fdt_pmu(s);
Signature · 1 line
2.46.0
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · Vasilis Liaskovitis

Add an "aliases" node with a "serial0" entry for the single UART in the riscv virt machine.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2774

Alistair

Quoted 29 lines
---
 hw/riscv/virt.c | 3 +++
 1 file changed, 3 insertions(+)
hw/riscv/virt.c +3 -1
index 2bc5a9dd98..fb1928cebf 100644
@@ -971,6 +971,7 @@ static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap,
     }
 
     qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", name);
+    qemu_fdt_setprop_string(ms->fdt, "/aliases", "serial0", name);
 }
 
 static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap,
@@ -1180,6 +1181,8 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap)
     qemu_fdt_setprop(ms->fdt, "/chosen", "rng-seed",
                      rng_seed, sizeof(rng_seed));
 
+    qemu_fdt_add_subnode(ms->fdt, "/aliases");
+
     create_fdt_flash(s, memmap);
     create_fdt_fw_cfg(s, memmap);
     create_fdt_pmu(s);
--

2.46.0

#2 lore raw
In reply to Vasilis Liaskovitis
Quoted 7 lines · Vasilis Liaskovitis

Add an "aliases" node with a "serial0" entry for the single UART in the riscv virt machine.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2774

Thanks!

Applied to riscv-to-apply.next

Alistair

Quoted 29 lines
---
 hw/riscv/virt.c | 3 +++
 1 file changed, 3 insertions(+)
hw/riscv/virt.c +3 -1
index 2bc5a9dd98..fb1928cebf 100644
@@ -971,6 +971,7 @@ static void create_fdt_uart(RISCVVirtState *s, const MemMapEntry *memmap,
     }
 
     qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", name);
+    qemu_fdt_setprop_string(ms->fdt, "/aliases", "serial0", name);
 }
 
 static void create_fdt_rtc(RISCVVirtState *s, const MemMapEntry *memmap,
@@ -1180,6 +1181,8 @@ static void create_fdt(RISCVVirtState *s, const MemMapEntry *memmap)
     qemu_fdt_setprop(ms->fdt, "/chosen", "rng-seed",
                      rng_seed, sizeof(rng_seed));
 
+    qemu_fdt_add_subnode(ms->fdt, "/aliases");
+
     create_fdt_flash(s, memmap);
     create_fdt_fw_cfg(s, memmap);
     create_fdt_pmu(s);
--

2.46.0