riscv: sivive_u: Add dummy serial clock and aliases entry for uart
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 riscv: sivive_u: Add dummy serial clock and aliases entry for uart
The riscv uart needs valid clocks. This requires a refereence to the clock node. Since the SOC clock is not emulated by qemu, add a reference to a fixed clock instead. The clock-frequency entry in the uart node does not seem to be necessary, so drop it.
In addition to a reference to the clock, the driver also needs an aliases entry for the serial node. Add it as well.
Without this patch, the serial driver fails to instantiate with the following error message.
sifive-serial 10013000.uart: unable to find controller clock
sifive-serial: probe of 10013000.uart failed with error -2
when trying to boot Linux.
--- hw/riscv/sifive_u.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
hw/riscv/sifive_u.c +17 -2
@@ -76,6 +76,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,char *nodename;char ethclk_names[] ="pclk\0hclk\0tx_clk" ;uint32_t plic_phandle, ethclk_phandle, phandle =1 ; +uint32_t uartclk_phandle; fdt = s->fdt =create_device_tree (&s->fdt_size);if (!fdt) {
@@ -226,6 +227,17 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 );g_free (nodename); + uartclk_phandle = phandle++; + nodename =g_strdup_printf ("/soc/uartclk" ); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); +qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); +qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,3686400 ); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , uartclk_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"linux,phandle" , uartclk_phandle); + uartclk_phandle =qemu_fdt_get_phandle (fdt, nodename); +g_free (nodename); + nodename =g_strdup_printf ("/soc/uart@%lx" , (long )memmap[SIFIVE_U_UART0 ].base);qemu_fdt_add_subnode (fdt, nodename);
@@ -233,8 +245,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_UART0 ].base,0x0 , memmap[SIFIVE_U_UART0 ].size); -qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" , -SIFIVE_U_CLOCK_FREQ /2 ); +qemu_fdt_setprop_cells (fdt, nodename,"clocks" , uartclk_phandle);qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle);qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );
@@ -243,6 +254,10 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,if (cmdline) {qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } + +qemu_fdt_add_subnode (fdt,"/aliases" ); +qemu_fdt_setprop_string (fdt,"/aliases" ,"serial0" , nodename); +g_free (nodename);return fdt;
Signature · 1 line
2.7.4
Quoted 12 lines · Guenter Roeck
The riscv uart needs valid clocks. This requires a refereence to the clock node. Since the SOC clock is not emulated by qemu, add a reference to a fixed clock instead. The clock-frequency entry in the uart node does not seem to be necessary, so drop it.
In addition to a reference to the clock, the driver also needs an aliases entry for the serial node. Add it as well.
Without this patch, the serial driver fails to instantiate with the following error message.
Quoted 6 lines
sifive-serial 10013000.uart: unable to find controller clock
sifive-serial: probe of 10013000.uart failed with error -2when trying to boot Linux.
Signed-off-by Guenter Roeck <[email protected]>
Alistair
Quoted 59 lines
--- hw/riscv/sifive_u.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)hw/riscv/sifive_u.c +17
-3@@ -76,6 +76,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,char *nodename;char ethclk_names[] ="pclk\0hclk\0tx_clk" ;uint32_t plic_phandle, ethclk_phandle, phandle =1 ; +uint32_t uartclk_phandle; fdt = s->fdt =create_device_tree (&s->fdt_size);if (!fdt) {@@ -226,6 +227,17 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 );g_free (nodename); + uartclk_phandle = phandle++; + nodename =g_strdup_printf ("/soc/uartclk" ); +qemu_fdt_add_subnode (fdt, nodename); +qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"fixed-clock" ); +qemu_fdt_setprop_cell (fdt, nodename,"#clock-cells" ,0x0 ); +qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" ,3686400 ); +qemu_fdt_setprop_cell (fdt, nodename,"phandle" , uartclk_phandle); +qemu_fdt_setprop_cell (fdt, nodename,"linux,phandle" , uartclk_phandle); + uartclk_phandle =qemu_fdt_get_phandle (fdt, nodename); +g_free (nodename); + nodename =g_strdup_printf ("/soc/uart@%lx" , (long )memmap[SIFIVE_U_UART0 ].base);qemu_fdt_add_subnode (fdt, nodename);@@ -233,8 +245,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"reg" ,0x0 , memmap[SIFIVE_U_UART0 ].base,0x0 , memmap[SIFIVE_U_UART0 ].size); -qemu_fdt_setprop_cell (fdt, nodename,"clock-frequency" , -SIFIVE_U_CLOCK_FREQ /2 ); +qemu_fdt_setprop_cells (fdt, nodename,"clocks" , uartclk_phandle);qemu_fdt_setprop_cells (fdt, nodename,"interrupt-parent" , plic_phandle);qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_UART0_IRQ );@@ -243,6 +254,10 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,if (cmdline) {qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } + +qemu_fdt_add_subnode (fdt,"/aliases" ); +qemu_fdt_setprop_string (fdt,"/aliases" ,"serial0" , nodename); +g_free (nodename);return fdt; --2.7.4
PATCH 3/3 riscv: sifive_u: Fix clock-names property for ethernet node
In reply to a message not in the archiveThe correct property name is clock-names, not clocks-names.
Without this patch, the Ethernet driver fails to instantiate with the following error.
macb 100900fc.ethernet: failed to get macb_clk (-2)
macb: probe of 100900fc.ethernet failed with error -2
--- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/riscv/sifive_u.c +1 -1
@@ -215,7 +215,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , ethclk_phandle, ethclk_phandle, ethclk_phandle); -qemu_fdt_setprop (fdt, nodename,"clocks-names" , ethclk_names, +qemu_fdt_setprop (fdt, nodename,"clock-names" , ethclk_names,sizeof (ethclk_names));qemu_fdt_setprop_cells (fdt, nodename,"#address-cells" ,1 );qemu_fdt_setprop_cells (fdt, nodename,"#size-cells" ,0 );
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH 3/3] riscv: sifive_u: Fix clock-names property for ethernet node
Quoted 10 lines · Guenter Roeck
The correct property name is clock-names, not clocks-names.
Without this patch, the Ethernet driver fails to instantiate with the following error.
macb 100900fc.ethernet: failed to get
macb_clk(-2)
macb: probe of 100900fc.ethernet failed with error -2Signed-off-by Guenter Roeck <[email protected]>
Alistair
Quoted 21 lines
--- hw/riscv/sifive_u.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/riscv/sifive_u.c +1
-2@@ -215,7 +215,7 @@ static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_cells (fdt, nodename,"interrupts" ,SIFIVE_U_GEM_IRQ );qemu_fdt_setprop_cells (fdt, nodename,"clocks" , ethclk_phandle, ethclk_phandle, ethclk_phandle); -qemu_fdt_setprop (fdt, nodename,"clocks-names" , ethclk_names, +qemu_fdt_setprop (fdt, nodename,"clock-names" , ethclk_names,sizeof (ethclk_names));qemu_fdt_setprop_cells (fdt, nodename,"#address-cells" ,1 );qemu_fdt_setprop_cells (fdt, nodename,"#size-cells" ,0 ); --2.7.4
Alistair Francis
Reviewed-byRe: [Qemu-devel] [PATCH 1/3] riscv: sifive_u: Add support for loading initrd
In reply to a message not in the archiveQuoted 5 lines · Guenter Roeck
Add support for loading initrd with "-initrd <filename>" to the
sifive_umachine. This lets us boot into Linux without disk drive.Signed-off-by Guenter Roeck <[email protected]>
Alistair
Quoted 69 lines
--- hw/riscv/sifive_u.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)hw/riscv/sifive_u.c +1
-1@@ -67,7 +67,7 @@ static const struct MemmapEntry {#define GEM_REVISION 0x10070109 -static void create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap, +static void *create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,uint64_t mem_size,const char *cmdline){ void *fdt;hw/riscv/sifive_u.c +3
-0@@ -244,11 +244,14 @@ static void create_fdt(SiFiveUState *s, conststruct MemmapEntry *memmap, qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",cmdline ); }g_free (nodename); + +return fdt; }static void riscv_sifive_u_init (MachineState *machine) {const struct MemmapEntry *memmap = sifive_u_memmap; +void *fdt;SiFiveUState *s = g_new0(SiFiveUState, 1); MemoryRegion *system_memory = get_system_memory();hw/riscv/sifive_u.c +2
-2@@ -269,13 +272,24 @@ static void riscv_sifive_u_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine- >kernel_cmdline); + fdt =create_fdt (s, memmap, machine->ram_size, machine- >kernel_cmdline);riscv_find_and_load_firmware (machine,BIOS_FILENAME , memmap[SIFIVE_U_DRAM ].base);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename); + uint64_t kernel_entry = riscv_load_kernel(machine-Quoted 1 line
kernel_filename);hw/riscv/sifive_u.c +5
-0+ +if (machine->initrd_filename) { +hwaddr start; + hwaddr end = riscv_load_initrd(machine->initrd_filename, + machine->ram_size,
kernel_entry,hw/riscv/sifive_u.c +4
-0+ &start); +qemu_fdt_setprop_cell (fdt,"/chosen" , +"linux,initrd-start" , start); + qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
hw/riscv/sifive_u.c +2
-0+ end); + } }/* reset vector */
Re: [Qemu-devel] [PATCH 1/3] riscv: sifive_u: Add support for loading initrd
In reply to a message not in the archiveQuoted 54 lines · On Fri, 19 Jul 2019 06:40:43 PDT (-0700), [email protected] wrote:
Add support for loading initrd with "-initrd <filename>" to the
sifive_umachine. This lets us boot into Linux without disk drive.Signed-off-by Guenter Roeck <[email protected]>--- hw/riscv/sifive_u.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)hw/riscv/sifive_u.c +10
-3@@ -67,7 +67,7 @@ static const struct MemmapEntry {#define GEM_REVISION 0x10070109 -static void create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap, +static void *create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap,uint64_t mem_size,const char *cmdline) {void *fdt;@@ -244,11 +244,14 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); }g_free (nodename); + +return fdt; }static void riscv_sifive_u_init (MachineState *machine) {const struct MemmapEntry *memmap = sifive_u_memmap; +void *fdt;SiFiveUState *s =g_new0 (SiFiveUState,1 );MemoryRegion *system_memory =get_system_memory ();@@ -269,13 +272,24 @@ static void riscv_sifive_u_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); + fdt =create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline);riscv_find_and_load_firmware (machine,BIOS_FILENAME , memmap[SIFIVE_U_DRAM ].base);if (machine->kernel_filename) { -riscv_load_kernel (machine->kernel_filename); +uint64_t kernel_entry =riscv_load_kernel (machine->kernel_filename); + +if (machine->initrd_filename) { +hwaddr start; + hwaddr end = riscv_load_initrd(machine->initrd_filename,
hw/riscv/sifive_u.c static void riscv_sifive_u_init(MachineState *machine) · line 295
Quoted 10 lines
hw/riscv/sifive_u.c +7
-0+ machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (fdt,"/chosen" ,"linux,initrd-end" , + end); + } }/* reset vector */
Thanks. I've queued all three of these.